From 3ac092bd7d700c6316c64660e2a722a2f85652a5 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Tue, 27 Sep 2011 18:56:29 -0400 Subject: fix crash in pthread_cond_wait mutex-locked check it was assuming the result of the condition it was supposed to be checking for, i.e. that the thread ptr had already been initialized by pthread_mutex_lock. use the slower call to be safe. --- src/thread/pthread_cond_timedwait.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c index 60ebbb97..56e71c2d 100644 --- a/src/thread/pthread_cond_timedwait.c +++ b/src/thread/pthread_cond_timedwait.c @@ -37,7 +37,7 @@ int pthread_cond_timedwait(pthread_cond_t *c, pthread_mutex_t *m, const struct t struct cm cm = { .c=c, .m=m }; int r, e=0, seq; - if (m->_m_type && (m->_m_lock&INT_MAX) != __pthread_self()->tid) + if (m->_m_type && (m->_m_lock&INT_MAX) != pthread_self()->tid) return EPERM; if (ts && ts->tv_nsec >= 1000000000UL) -- cgit 1.4.1