summaryrefslogtreecommitdiff
path: root/libpthread/linuxthreads.old
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-07-21 23:33:57 -0400
committerMike Frysinger <vapier@gentoo.org>2009-07-21 23:33:57 -0400
commit75c94b00a2cd19ba2a1188578b848bfc2c8e8e2e (patch)
treec0395bc7abee9062a46ca0a134c940ad464c105d /libpthread/linuxthreads.old
parent44bc29e4f3bf4310fabbed3b187bc0aad8827db0 (diff)
linuxthreads.old: fix crash in debug code
If pthread_join() is called and there is nothing to join, then the debug code will attempt to dereference a NULL pointer. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'libpthread/linuxthreads.old')
-rw-r--r--libpthread/linuxthreads.old/join.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpthread/linuxthreads.old/join.c b/libpthread/linuxthreads.old/join.c
index ee3449396..4a7c0d8ac 100644
--- a/libpthread/linuxthreads.old/join.c
+++ b/libpthread/linuxthreads.old/join.c
@@ -77,7 +77,7 @@ void __pthread_do_exit(void *retval, char *currentframe)
THREAD_SETMEM(self, p_terminated, 1);
/* See if someone is joining on us */
joining = THREAD_GETMEM(self, p_joining);
- PDEBUG("joining = %p, pid=%d\n", joining, joining->p_pid);
+ PDEBUG("joining = %p, pid=%d\n", joining, joining ? joining->p_pid : 0);
__pthread_unlock(THREAD_GETMEM(self, p_lock));
/* Restart joining thread if any */
if (joining != NULL) restart(joining);