From e1a304ff665f74036c7a848cb1fd3cf49e3ae3db Mon Sep 17 00:00:00 2001 From: shyouhei Date: Wed, 8 Apr 2009 09:59:58 +0000 Subject: merge revision(s) 19486: * win32/win32.c (subtruct): check tv_sec. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@23156 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- win32/win32.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'win32') diff --git a/win32/win32.c b/win32/win32.c index 96e235af93..1d342316fe 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -2196,6 +2196,9 @@ do_select(int nfds, fd_set *rd, fd_set *wr, fd_set *ex, static inline int subtract(struct timeval *rest, const struct timeval *wait) { + if (rest->tv_sec < wait->tv_sec) { + return 0; + } while (rest->tv_usec < wait->tv_usec) { if (rest->tv_sec <= wait->tv_sec) { return 0; -- cgit v1.2.3