2002-10-17 Thomas Pfaff <tpfaff@gmx.net>

	* thread.cc (verifyable_object_isvalid): Test for static object first.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 497df6970f62ef6725a0d327d29c75bf950c4671..2143aecba76b02dd9078195fc112dcf8e8d7acd4 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-17  Thomas Pfaff  <tpfaff@gmx.net>
+ 
+       * thread.cc (verifyable_object_isvalid): Test for static object first.
+
 2002-10-16  Christopher Faylor  <cgf@redhat.com>
 
        * fhandler_tty.cc (fhandler_tty_slave::read): Attempt #527 to properly

diff --git a/winsup/cygwin/thread.cc b/winsup/cygwin/thread.cc
index dd44c64dc9d1866a4ad222517f5b80975a3694de..75dd7d38461c39393bf5d374703b2d7b2bde8e3d 100644 (file)
--- a/winsup/cygwin/thread.cc
+++ b/winsup/cygwin/thread.cc
@@ -1356,12 +1356,12 @@ verifyable_object_state
 verifyable_object_isvalid (void const * objectptr, long magic, void *static_ptr)
 {
   verifyable_object **object = (verifyable_object **)objectptr;
+  if (static_ptr && *object == static_ptr)
+    return VALID_STATIC_OBJECT;
   if (check_valid_pointer (object))
     return INVALID_OBJECT;
   if (!*object)
     return INVALID_OBJECT;
-  if (static_ptr && *object == static_ptr)
-    return VALID_STATIC_OBJECT;
   if (check_valid_pointer (*object))
     return INVALID_OBJECT;
   if ((*object)->magic != magic)