submitted-nptl-invalid-td

2010-02-27  Aurelien Jarno  <aurelien@aurel32.net>

	* pthreadP.h(INVALID_TD_P, INVALID_NOT_TERMINATED_TD_P): detect
	NULL pointers.

Gbp-Pq: Topic any
Gbp-Pq: Name submitted-nptl-invalid-td.patch

diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
index 6f94d6be31660f10df326799fe6f7e4d1432d79f..e32c9626964fe8071d5a32e95a6212aa9afe8b9b 100644 (file)
--- a/nptl/pthreadP.h
+++ b/nptl/pthreadP.h
@@ -255,8 +255,8 @@ extern int __pthread_debug attribute_hidden;
 /* Simplified test.  This will not catch all invalid descriptors but
    is better than nothing.  And if the test triggers the thread
    descriptor is guaranteed to be invalid.  */
-# define INVALID_TD_P(pd) __builtin_expect ((pd)->tid <= 0, 0)
-# define INVALID_NOT_TERMINATED_TD_P(pd) __builtin_expect ((pd)->tid < 0, 0)
+# define INVALID_TD_P(pd) __builtin_expect (!pd || ((pd)->tid <= 0), 0)
+# define INVALID_NOT_TERMINATED_TD_P(pd) __builtin_expect (!pd || ((pd)->tid < 0), 0)
 #endif