X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fsem_timedwait.c;h=11a017005fc09df08502833431506b2f4e51795f;hp=ad3bf07581e2a83f01bfcd495b3f244c82ecdbe0;hb=b470030f839a375e5030ec9d44903ef7581c15a2;hpb=cfe581b6bc795e3f00ac30791314ec0f9be4b4ad

diff --git a/src/thread/sem_timedwait.c b/src/thread/sem_timedwait.c
index ad3bf075..11a01700 100644
--- a/src/thread/sem_timedwait.c
+++ b/src/thread/sem_timedwait.c
@@ -9,15 +9,18 @@ int sem_timedwait(sem_t *sem, const struct timespec *at)
 		if (a_fetch_add(sem->__val, -1) > 0) return 0;
 		val = a_fetch_add(sem->__val, 1)+1;
 		if (val==1) __wake(sem->__val, 1, 0);
-		CANCELPT_BEGIN;
 		if (at && at->tv_nsec >= 1000000000UL) {
 			errno = EINVAL;
 			return -1;
 		}
+		CANCELPT_BEGIN;
 		if (val <= 0 && __timedwait(sem->__val, val, CLOCK_REALTIME, at, 0) == ETIMEDOUT) {
 			errno = ETIMEDOUT;
+			CANCELPT_TRY;
+			CANCELPT_END;
 			return -1;
 		}
+		CANCELPT_TRY;
 		CANCELPT_END;
 	}
 }