From: Rich Felker <dalias@aerifal.cx>
Date: Mon, 23 Feb 2015 17:41:16 +0000 (-0500)
Subject: fix breakage in pthread_cond_wait due to typo
X-Git-Tag: v1.1.7~37
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e487c203db36750388228a2db75f96040cbfae58;p=oweals%2Fmusl.git

fix breakage in pthread_cond_wait due to typo

due to accidental use of = instead of ==, the error code was always
set to zero in the signaled wake case for non-shared cv waits.
suppressing ETIMEDOUT (the only possible wait error) is harmless and
actually permitted in this case, but suppressing mutex errors could
give the caller false information about the state of the mutex.

commit 8741ffe625363a553e8f509dc3ca7b071bdbab47 introduced this
regression and commit d9da1fb8c592469431c764732d09f7756340190e
preserved it when reorganizing the code.
---

diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
index d28b478e..adf9c6e5 100644
--- a/src/thread/pthread_cond_timedwait.c
+++ b/src/thread/pthread_cond_timedwait.c
@@ -163,7 +163,7 @@ relock:
 		a_dec(&m->_m_waiters);
 
 	/* Since a signal was consumed, cancellation is not permitted. */
-	if (e = ECANCELED) e = 0;
+	if (e == ECANCELED) e = 0;
 
 done:
 	__pthread_setcancelstate(cs, 0);