diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-10 03:26:21 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-10 03:26:21 +0000 |
commit | b84c5c3e36a5fe5152ec1f08c3742e0cecd9db7b (patch) | |
tree | 95b429859f478a6256eb185b960a9a69a0513b1e | |
parent | 33e54f3400b05a2e50d0d0a25cbd67a49ad08b29 (diff) |
merge revision(s) 47196: [Backport #10144]
* time.c (time_timespec): fix tv_nsec overflow
[Bug #10144]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47501 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | time.c | 4 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Wed Sep 10 12:25:24 2014 Eric Wong <e@80x24.org> + + * time.c (time_timespec): fix tv_nsec overflow + [Bug #10144] + Wed Sep 10 12:21:51 2014 Eric Wong <e@80x24.org> * ext/zlib/zlib.c (gzfile_reset): preserve ZSTREAM_FLAG_GZFILE @@ -2435,6 +2435,10 @@ time_timespec(VALUE num, int interval) d = modf(RFLOAT_VALUE(num), &f); if (d >= 0) { t.tv_nsec = (int)(d*1e9+0.5); + if (t.tv_nsec >= 1000000000) { + t.tv_nsec -= 1000000000; + f += 1; + } } else if ((t.tv_nsec = (int)(-d*1e9+0.5)) > 0) { t.tv_nsec = 1000000000 - t.tv_nsec; @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-09-10" -#define RUBY_PATCHLEVEL 562 +#define RUBY_PATCHLEVEL 563 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 9 |