From: Rich Felker <dalias@aerifal.cx>
Date: Mon, 2 Mar 2015 23:52:31 +0000 (-0500)
Subject: suppress masked cancellation in pthread_join
X-Git-Tag: v1.1.7~28
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=eb4bd8d8bb5c9f535ee8250edd4efbd3d4f84c5a;p=oweals%2Fmusl.git

suppress masked cancellation in pthread_join

like close, pthread_join is a resource-deallocation function which is
also a cancellation point. the intent of masked cancellation mode is
to exempt such functions from failure with ECANCELED.
---

diff --git a/src/thread/pthread_join.c b/src/thread/pthread_join.c
index bf4f03ce..966b4ab0 100644
--- a/src/thread/pthread_join.c
+++ b/src/thread/pthread_join.c
@@ -3,12 +3,16 @@
 
 int __munmap(void *, size_t);
 void __pthread_testcancel(void);
+int __pthread_setcancelstate(int, int *);
 
 int __pthread_join(pthread_t t, void **res)
 {
-	int tmp;
+	int tmp, cs;
 	__pthread_testcancel();
+	__pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
+	if (cs == PTHREAD_CANCEL_ENABLE) __pthread_setcancelstate(cs, 0);
 	while ((tmp = t->tid)) __timedwait_cp(&t->tid, tmp, 0, 0, 0);
+	__pthread_setcancelstate(cs, 0);
 	if (res) *res = t->result;
 	if (t->map_base) __munmap(t->map_base, t->map_size);
 	return 0;