diff options
| author | Robert Collins <rbtcollins@hotmail.com> | 2002-10-17 12:31:30 +0400 |
|---|---|---|
| committer | Robert Collins <rbtcollins@hotmail.com> | 2002-10-17 12:31:30 +0400 |
| commit | 841cf30bc32103486acd84d5407782f64dd9d6b3 (patch) | |
| tree | 72298b8ef49b04e687db6db7be79a7679881a769 | |
| parent | d7c2dc62fd82966c850daabd029979c5e3874dce (diff) | |
2002-10-17 Thomas Pfaff <tpfaff@gmx.net>
* thread.cc (verifyable_object_isvalid): Test for static object first.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/cygwin/thread.cc | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 497df6970..2143aecba 100644 --- 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 dd44c64dc..75dd7d384 100644 --- 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) |