fbf48b008c
Switch to an internal version of pthread_equal() without sanity checks. Problems detected on NetBSD 9.99.46.
106 lines
4.1 KiB
C
106 lines
4.1 KiB
C
$NetBSD: patch-nsprpub_pr_src_pthreads_ptsynch.c,v 1.1 2020/02/08 22:06:38 kamil Exp $
|
|
|
|
Workaround buggy usage of pthread_equal().
|
|
|
|
--- nsprpub/pr/src/pthreads/ptsynch.c.orig 2020-01-17 19:27:05.000000000 +0000
|
|
+++ nsprpub/pr/src/pthreads/ptsynch.c
|
|
@@ -25,6 +25,13 @@ static pthread_condattr_t _pt_cvar_attr;
|
|
extern PTDebug pt_debug; /* this is shared between several modules */
|
|
#endif /* defined(DEBUG) */
|
|
|
|
+/* XXX, pthread_equal() is misused to compare non-valid thread pointers */
|
|
+static int
|
|
+pt_pthread_equal(pthread_t t1, pthread_t t2)
|
|
+{
|
|
+ return t1 == t2;
|
|
+}
|
|
+
|
|
#if defined(FREEBSD)
|
|
/*
|
|
* On older versions of FreeBSD, pthread_mutex_trylock returns EDEADLK.
|
|
@@ -192,9 +199,9 @@ PR_IMPLEMENT(PRStatus) PR_Unlock(PRLock
|
|
PR_ASSERT(lock != NULL);
|
|
PR_ASSERT(_PT_PTHREAD_MUTEX_IS_LOCKED(lock->mutex));
|
|
PR_ASSERT(PR_TRUE == lock->locked);
|
|
- PR_ASSERT(pthread_equal(lock->owner, self));
|
|
+ PR_ASSERT(pt_pthread_equal(lock->owner, self));
|
|
|
|
- if (!lock->locked || !pthread_equal(lock->owner, self))
|
|
+ if (!lock->locked || !pt_pthread_equal(lock->owner, self))
|
|
return PR_FAILURE;
|
|
|
|
lock->locked = PR_FALSE;
|
|
@@ -217,7 +224,7 @@ PR_IMPLEMENT(void) PR_AssertCurrentThrea
|
|
* to the correctness of PR_AssertCurrentThreadOwnsLock(), but
|
|
* this particular order makes the assertion more likely to
|
|
* catch errors. */
|
|
- PR_ASSERT(lock->locked && pthread_equal(lock->owner, pthread_self()));
|
|
+ PR_ASSERT(lock->locked && pt_pthread_equal(lock->owner, pthread_self()));
|
|
}
|
|
|
|
/**************************************************************/
|
|
@@ -273,7 +280,7 @@ static void pt_PostNotifyToCvar(PRCondVa
|
|
_PT_Notified *notified = &cvar->lock->notified;
|
|
|
|
PR_ASSERT(PR_TRUE == cvar->lock->locked);
|
|
- PR_ASSERT(pthread_equal(cvar->lock->owner, pthread_self()));
|
|
+ PR_ASSERT(pt_pthread_equal(cvar->lock->owner, pthread_self()));
|
|
PR_ASSERT(_PT_PTHREAD_MUTEX_IS_LOCKED(cvar->lock->mutex));
|
|
|
|
while (1)
|
|
@@ -356,7 +363,7 @@ PR_IMPLEMENT(PRStatus) PR_WaitCondVar(PR
|
|
PR_ASSERT(_PT_PTHREAD_MUTEX_IS_LOCKED(cvar->lock->mutex));
|
|
PR_ASSERT(PR_TRUE == cvar->lock->locked);
|
|
/* and it better be by us */
|
|
- PR_ASSERT(pthread_equal(cvar->lock->owner, pthread_self()));
|
|
+ PR_ASSERT(pt_pthread_equal(cvar->lock->owner, pthread_self()));
|
|
|
|
if (_PT_THREAD_INTERRUPTED(thred)) goto aborted;
|
|
|
|
@@ -554,7 +561,7 @@ PR_IMPLEMENT(PRIntn) PR_GetMonitorEntryC
|
|
|
|
rv = pthread_mutex_lock(&mon->lock);
|
|
PR_ASSERT(0 == rv);
|
|
- if (pthread_equal(mon->owner, self))
|
|
+ if (pt_pthread_equal(mon->owner, self))
|
|
count = mon->entryCount;
|
|
rv = pthread_mutex_unlock(&mon->lock);
|
|
PR_ASSERT(0 == rv);
|
|
@@ -569,7 +576,7 @@ PR_IMPLEMENT(void) PR_AssertCurrentThrea
|
|
rv = pthread_mutex_lock(&mon->lock);
|
|
PR_ASSERT(0 == rv);
|
|
PR_ASSERT(mon->entryCount != 0 &&
|
|
- pthread_equal(mon->owner, pthread_self()));
|
|
+ pt_pthread_equal(mon->owner, pthread_self()));
|
|
rv = pthread_mutex_unlock(&mon->lock);
|
|
PR_ASSERT(0 == rv);
|
|
#endif
|
|
@@ -585,7 +592,7 @@ PR_IMPLEMENT(void) PR_EnterMonitor(PRMon
|
|
PR_ASSERT(0 == rv);
|
|
if (mon->entryCount != 0)
|
|
{
|
|
- if (pthread_equal(mon->owner, self))
|
|
+ if (pt_pthread_equal(mon->owner, self))
|
|
goto done;
|
|
while (mon->entryCount != 0)
|
|
{
|
|
@@ -616,8 +623,8 @@ PR_IMPLEMENT(PRStatus) PR_ExitMonitor(PR
|
|
PR_ASSERT(0 == rv);
|
|
/* the entries should be > 0 and we'd better be the owner */
|
|
PR_ASSERT(mon->entryCount > 0);
|
|
- PR_ASSERT(pthread_equal(mon->owner, self));
|
|
- if (mon->entryCount == 0 || !pthread_equal(mon->owner, self))
|
|
+ PR_ASSERT(pt_pthread_equal(mon->owner, self));
|
|
+ if (mon->entryCount == 0 || !pt_pthread_equal(mon->owner, self))
|
|
{
|
|
rv = pthread_mutex_unlock(&mon->lock);
|
|
PR_ASSERT(0 == rv);
|
|
@@ -664,7 +671,7 @@ PR_IMPLEMENT(PRStatus) PR_Wait(PRMonitor
|
|
/* the entries better be positive */
|
|
PR_ASSERT(mon->entryCount > 0);
|
|
/* and it better be owned by us */
|
|
- PR_ASSERT(pthread_equal(mon->owner, pthread_self()));
|
|
+ PR_ASSERT(pt_pthread_equal(mon->owner, pthread_self()));
|
|
|
|
/* tuck these away 'till later */
|
|
saved_entries = mon->entryCount;
|