summaryrefslogtreecommitdiff
path: root/eval.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-11-21 15:36:37 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-11-21 15:36:37 +0000
commitda795859595f66e01b9504acf2e89377761d5e4b (patch)
treedfeb713542ea1303aa073390965b6e2b284dd35d /eval.c
parent904c9d27cedee45de9c3af0561cc1b5a66d3920e (diff)
* parse.y (str_extend): should check nesting parentheses in #{}.
* eval.c (rb_thread_select): tv_sec and tv_usec should not be negative. * signal.c (posix_signal): do not set SA_RESTART for SIGVTALRM. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@1851 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r--eval.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/eval.c b/eval.c
index 6288a97858..51ef9c0679 100644
--- a/eval.c
+++ b/eval.c
@@ -7818,6 +7818,8 @@ rb_thread_select(max, read, write, except, timeout)
tv.tv_sec = (unsigned int)d;
tv.tv_usec = (long)((d-(double)tv.tv_sec)*1e6);
+ if (tv.tv_sec < 0) tv.tv_sec = 0;
+ if (tv.tv_usec < 0) tv.tv_usec = 0;
}
continue;
default: