drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* thread.cc (pthread_cond_timedwait): Check abstime for validity 

according to SUSv3.  Rewrite timeout check and waitlength calculation
	to avoid overflow problems.
This commit is contained in:
Corinna Vinschen 2005-08-05 11:31:33 +00:00
parent d607be551d
commit 8cba692063
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
2005-08-05 Corinna Vinschen <corinna@vinschen.de>
* thread.cc (pthread_cond_timedwait): Check abstime for validity
according to SUSv3. Rewrite timeout check and waitlength calculation
to avoid overflow problems.
2005-08-02 Yitzchak Scott-Thoennes <sthoenna@efn.org> 2005-08-02 Yitzchak Scott-Thoennes <sthoenna@efn.org>
* include/sys/termios.h: Define TIOCMBIS and TIOCMBIC. * include/sys/termios.h: Define TIOCMBIS and TIOCMBIC.

20
winsup/cygwin/thread.cc
View File

@ -2615,7 +2615,7 @@ pthread_cond_timedwait (pthread_cond_t *cond, pthread_mutex_t *mutex,
const struct timespec *abstime) const struct timespec *abstime)
{ {
struct timeval tv; struct timeval tv;
long waitlength; DWORD waitlength;
myfault efault; myfault efault;
if (efault.faulted ()) if (efault.faulted ())
@ -2623,11 +2623,23 @@ pthread_cond_timedwait (pthread_cond_t *cond, pthread_mutex_t *mutex,
pthread_testcancel (); pthread_testcancel ();
/* According to SUSv3, the abstime value must be checked for validity. */
if (abstime->tv_sec < 0
|| abstime->tv_nsec < 0
|| abstime->tv_nsec > 999999999)
return EINVAL;
gettimeofday (&tv, NULL); gettimeofday (&tv, NULL);
waitlength = abstime->tv_sec * 1000 + abstime->tv_nsec / (1000 * 1000); /* Check for immediate timeout before converting to microseconds, since
waitlength -= tv.tv_sec * 1000 + tv.tv_usec / 1000; the resulting value can easily overflow long. This also allows to
if (waitlength < 0) evaluate microseconds directly in DWORD. */
if (tv.tv_sec > abstime->tv_sec
|| (tv.tv_sec == abstime->tv_sec
&& tv.tv_usec > abstime->tv_nsec / 1000))
return ETIMEDOUT; return ETIMEDOUT;
waitlength = (abstime->tv_sec - tv.tv_sec) * 1000;
waitlength += (abstime->tv_nsec / 1000 - tv.tv_usec) / 1000;
return __pthread_cond_dowait (cond, mutex, waitlength); return __pthread_cond_dowait (cond, mutex, waitlength);
} }