summaryrefslogtreecommitdiffstats
path: root/time.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-04-22 11:25:26 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-04-22 11:25:26 +0000
commit93f31d55d118f625b119d4307fc4fbec52f86642 (patch)
tree31146b379353c32d60754bb8eadbb6b6adbe7b76 /time.c
parentb12115c951b720009d703317ea6b587ab98495af (diff)
downloadruby-93f31d55d118f625b119d4307fc4fbec52f86642.tar.gz
ruby-93f31d55d118f625b119d4307fc4fbec52f86642.tar.xz
ruby-93f31d55d118f625b119d4307fc4fbec52f86642.zip
* time.c (time_timespec): check out-of-range. [ruby-core:23282]
[Bug #1396] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23260 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'time.c')
-rw-r--r--time.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/time.c b/time.c
index 68f26aa3c..010a2f026 100644
--- a/time.c
+++ b/time.c
@@ -1217,7 +1217,14 @@ time_timespec(VALUE num, int interval)
if (f != t.tv_sec) {
rb_raise(rb_eRangeError, "%f out of Time range", RFLOAT_VALUE(num));
}
- t.tv_nsec = (long)(d*1e9+0.5);
+ t.tv_nsec = (int)(d*1e9+0.5);
+ if (t.tv_nsec >= 1000000000) {
+ t.tv_nsec -= 1000000000;
+ if (++t.tv_sec <= 0) {
+ --t.tv_nsec;
+ t.tv_nsec = 999999999;
+ }
+ }
}
break;