From: Rich Felker <dalias@aerifal.cx>
Date: Mon, 1 Apr 2019 22:51:50 +0000 (-0400)
Subject: fix harmless-by-chance typo in priority inheritance mutex code
X-Git-Tag: v1.1.22~7
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8ee0ca0ce6cc04f3283e5391773108376ba5b4aa;p=oweals%2Fmusl.git

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.
---

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;
 	}