overhaul cancellation to fix resource leaks and dangerous behavior with signals

[musl] / src / thread / sem_timedwait.c

diff --git a/src/thread/sem_timedwait.c b/src/thread/sem_timedwait.c
index ad3bf07..11a0170 100644 (file)
--- 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;
        }
 }