From 7d09b9d1449dddc36a8c8830ce20c8a6e2e71585 Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 31 Dec 2007 13:56:42 +0000 Subject: * thread_pthread.c (native_sleep): timespec tv_sec may overflow on some platform. a patch from zunda in [ruby-dev:32904]. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14815 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ thread_pthread.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f79f0995b..33b796e2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Dec 31 22:53:29 2007 Yukihiro Matsumoto + + * thread_pthread.c (native_sleep): timespec tv_sec may overflow on + some platform. a patch from zunda in + [ruby-dev:32904]. + Mon Dec 31 19:35:20 2007 Tanaka Akira * string.c (IS_7BIT): removed. diff --git a/thread_pthread.c b/thread_pthread.c index daeca964a..962215b1a 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -432,7 +432,7 @@ native_sleep(rb_thread_t *th, struct timeval *tv) thread_debug("native_sleep: interrupted before sleep\n"); } else { - if (tv == 0) { + if (tv == 0 || ts.tv_sec < tvn.tv_sec /* overflow */ ) { thread_debug("native_sleep: pthread_cond_wait start\n"); pthread_cond_wait(&th->native_thread_data.sleep_cond, &th->interrupt_lock); -- cgit