merge revision(s) r47196: [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_1@47482 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 10 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index f2b89c44ca..bf3fb8d660 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep 10 03:01:31 2014  Eric Wong  <e@80x24.org>
+
+	* time.c (time_timespec): fix tv_nsec overflow
+	  [Bug #10144]
+
 Wed Sep 10 02:51:38 2014  Koichi Sasada  <ko1@atdot.net>
 
 	* iseq.c (rb_iseq_clone): Should not insert write barrier from
diff --git a/time.c b/time.c
index d5215edde1..5ad1035c4d 100644
--- a/time.c
+++ b/time.c
@@ -2350,6 +2350,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;
diff --git a/version.h b/version.h
index 4275f66862..5a0f256a82 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-09-10"
-#define RUBY_PATCHLEVEL 229
+#define RUBY_PATCHLEVEL 230
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 9