From owner-p4-projects@FreeBSD.ORG  Wed Jul 12 07:11:19 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 891B916A4E0; Wed, 12 Jul 2006 07:11:19 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 29F7C16A4DD
	for <perforce@freebsd.org>; Wed, 12 Jul 2006 07:11:19 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E963F43D46
	for <perforce@freebsd.org>; Wed, 12 Jul 2006 07:11:18 +0000 (GMT)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6C7BIxR081690
	for <perforce@freebsd.org>; Wed, 12 Jul 2006 07:11:18 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6C7BIkP081687
	for perforce@freebsd.org; Wed, 12 Jul 2006 07:11:18 GMT
	(envelope-from kmacy@freebsd.org)
Date: Wed, 12 Jul 2006 07:11:18 GMT
Message-Id: <200607120711.k6C7BIkP081687@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 101337 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Jul 2006 07:11:19 -0000

http://perforce.freebsd.org/chv.cgi?CH=101337

Change 101337 by kmacy@kmacy_vt-x:dtrace on 2006/07/12 07:11:15

	apply change 1.3 
	fixes segmentation fault in applications statically linked to libthr

Affected files ...

.. //depot/projects/dtrace/src/lib/libthr/sys/thr_error.c#3 edit

Differences ...

==== //depot/projects/dtrace/src/lib/libthr/sys/thr_error.c#3 (text+ko) ====

@@ -45,10 +45,12 @@
 int *
 __error(void)
 {
-	struct pthread *curthread = _get_curthread();
+	struct pthread *curthread;
 
-	if (curthread != NULL && curthread != _thr_initial)
-		return (&curthread->error);
-	else
+	if (_thr_initial != NULL) {
+		curthread = _get_curthread();
+		if (curthread != NULL && curthread != _thr_initial)
+			return (&curthread->error);
+	} else
 		return (&errno);
 }