When checking for valid timevals in the wrapped select() and poll()

routines, don't return EINVAL but set errno to EINVAL and return -1.
Added a check in pthread_cond_timedwait for a null timespec pointer.

1 files changed, 4 insertions, 2 deletions

diff --git a/lib/libpthread/thread/thr_select.c b/lib/libpthread/thread/thr_select.c
index a7ea8cf..9bfae89 100644
--- a/lib/libpthread/thread/thr_select.c
+++ b/lib/libpthread/thread/thr_select.c
@@ -59,8 +59,10 @@ select(int numfds, fd_set * readfds, fd_set * writefds,
 	/* Check if a timeout was specified: */
 	if (timeout) {
 		if (timeout->tv_sec < 0 ||
-			timeout->tv_usec < 0 || timeout->tv_usec >= 1000000)
-			return (EINVAL); 
+			timeout->tv_usec < 0 || timeout->tv_usec >= 1000000) {
+			errno = EINVAL;
+			return (-1);
+		}
 
 		/* Convert the timeval to a timespec: */
 		TIMEVAL_TO_TIMESPEC(timeout, &ts);