drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARGH. Check in previous uncommitted-but-ChangeLog'ed entry.

This commit is contained in:
Christopher Faylor 2005-07-05 02:02:23 +00:00
parent cec1d3b414
commit a64b8b2dec
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/cygwin/thread.cc
View File

@ -117,9 +117,11 @@ verifyable_object_isvalid (void const * objectptr, long magic, void *static_ptr1
void *static_ptr2, void *static_ptr3) void *static_ptr2, void *static_ptr3)
{ {
verifyable_object **object = (verifyable_object **) objectptr; verifyable_object **object = (verifyable_object **) objectptr;
myfault efault; myfault efault;
if (efault.faulted ()) if (efault.faulted ())
return INVALID_OBJECT; return INVALID_OBJECT;
if ((static_ptr1 && *object == static_ptr1) || if ((static_ptr1 && *object == static_ptr1) ||
(static_ptr2 && *object == static_ptr2) || (static_ptr2 && *object == static_ptr2) ||
(static_ptr3 && *object == static_ptr3)) (static_ptr3 && *object == static_ptr3))
@ -2614,8 +2616,8 @@ pthread_cond_timedwait (pthread_cond_t *cond, pthread_mutex_t *mutex,
{ {
struct timeval tv; struct timeval tv;
long waitlength; long waitlength;
myfault efault;
myfault efault;
if (efault.faulted ()) if (efault.faulted ())
return EINVAL; return EINVAL;
@ -2886,8 +2888,7 @@ pthread_mutex::init (pthread_mutex_t *mutex,
{ {
pthread_mutex_t new_mutex; pthread_mutex_t new_mutex;
myfault efault; if (attr && !pthread_mutexattr::is_good_object (attr))
if (attr && !pthread_mutexattr::is_good_object (attr) || efault.faulted ())
return EINVAL; return EINVAL;
mutex_initialization_lock.lock (); mutex_initialization_lock.lock ();