summaryrefslogtreecommitdiff
path: root/src/thread
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2019-04-01 18:51:50 -0400
committerRich Felker <dalias@aerifal.cx>2019-04-01 18:51:50 -0400
commit8ee0ca0ce6cc04f3283e5391773108376ba5b4aa (patch)
treedce36fdd1e20799795424a0a6add957be8bea195 /src/thread
parent54ca677983d47529bab8752315ac1a2b49888870 (diff)
downloadmusl-8ee0ca0ce6cc04f3283e5391773108376ba5b4aa.tar.gz
musl-8ee0ca0ce6cc04f3283e5391773108376ba5b4aa.tar.bz2
musl-8ee0ca0ce6cc04f3283e5391773108376ba5b4aa.tar.xz
musl-8ee0ca0ce6cc04f3283e5391773108376ba5b4aa.zip
fix harmless-by-chance typo in priority inheritance mutex code
commit 54ca677983d47529bab8752315ac1a2b49888870 inadvertently introduced bitwise and where logical and was intended. since the right-hand operand is always 0 or -1 whenever the left-hand operand is nonzero, the behavior happened to be equivalent.
Diffstat (limited to 'src/thread')
-rw-r--r--src/thread/pthread_mutex_trylock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/thread/pthread_mutex_trylock.c b/src/thread/pthread_mutex_trylock.c
index 37e5c473..a24e7c58 100644
--- a/src/thread/pthread_mutex_trylock.c
+++ b/src/thread/pthread_mutex_trylock.c
@@ -36,7 +36,7 @@ int __pthread_mutex_trylock_owner(pthread_mutex_t *m)
if (a_cas(&m->_m_lock, old, tid) != old) {
self->robust_list.pending = 0;
- if ((type&12)==12 & m->_m_waiters) return ENOTRECOVERABLE;
+ if ((type&12)==12 && m->_m_waiters) return ENOTRECOVERABLE;
return EBUSY;
}