cuserid: support invocation with a null pointer argument

[musl] / src / thread / sem_timedwait.c

diff --git a/src/thread/sem_timedwait.c b/src/thread/sem_timedwait.c
index df5f3a6..58d3ebf 100644 (file)
--- a/src/thread/sem_timedwait.c
+++ b/src/thread/sem_timedwait.c
@@ -8,17 +8,20 @@ static void cleanup(void *p)
 
 int sem_timedwait(sem_t *restrict sem, const struct timespec *restrict at)
 {
+       pthread_testcancel();
+
        if (!sem_trywait(sem)) return 0;
 
        int spins = 100;
-       while (spins-- && sem->__val[0] <= 0) a_spin();
+       while (spins-- && sem->__val[0] <= 0 && !sem->__val[1]) a_spin();
 
        while (sem_trywait(sem)) {
                int r;
                a_inc(sem->__val+1);
                a_cas(sem->__val, 0, -1);
-               r = __timedwait(sem->__val, -1, CLOCK_REALTIME, at, cleanup, sem->__val+1, sem->__val[2]);
-               a_dec(sem->__val+1);
+               pthread_cleanup_push(cleanup, (void *)(sem->__val+1));
+               r = __timedwait_cp(sem->__val, -1, CLOCK_REALTIME, at, sem->__val[2]);
+               pthread_cleanup_pop(1);
                if (r) {
                        errno = r;
                        return -1;