From cfe581b6bc795e3f00ac30791314ec0f9be4b4ad Mon Sep 17 00:00:00 2001
From: Rich Felker <dalias@aerifal.cx>
Date: Thu, 10 Mar 2011 21:52:18 -0500
Subject: fix some semaphore wait semantics (race condition deadlock and error
 checking)

---
 src/thread/sem_timedwait.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/thread/sem_timedwait.c')

diff --git a/src/thread/sem_timedwait.c b/src/thread/sem_timedwait.c
index e6c2495a..ad3bf075 100644
--- a/src/thread/sem_timedwait.c
+++ b/src/thread/sem_timedwait.c
@@ -8,7 +8,12 @@ int sem_timedwait(sem_t *sem, const struct timespec *at)
 	for (;;) {
 		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;
+		}
 		if (val <= 0 && __timedwait(sem->__val, val, CLOCK_REALTIME, at, 0) == ETIMEDOUT) {
 			errno = ETIMEDOUT;
 			return -1;
-- 
cgit v1.2.1