From 95fa22a65cf0866afaf3efd933a180509922f047 Mon Sep 17 00:00:00 2001
From: Lukas Joeressen <lukas@joeressen.net>
Date: Mon, 15 Jun 2015 15:03:44 +0200
Subject: Rounding errors could make time_alloc imprecise

---
 mrbgems/mruby-time/src/time.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'mrbgems/mruby-time/src')

diff --git a/mrbgems/mruby-time/src/time.c b/mrbgems/mruby-time/src/time.c
index b377f3e33..36bbbe00a 100644
--- a/mrbgems/mruby-time/src/time.c
+++ b/mrbgems/mruby-time/src/time.c
@@ -6,6 +6,7 @@
 
 #include <stdio.h>
 #include <time.h>
+#include <math.h>
 #include "mruby.h"
 #include "mruby/class.h"
 #include "mruby/data.h"
@@ -208,12 +209,12 @@ time_alloc(mrb_state *mrb, double sec, double usec, enum mrb_timezone timezone)
   out_of_range:
     mrb_raisef(mrb, E_ARGUMENT_ERROR, "%S out of Time range", mrb_float_value(mrb, sec));
   }
-  tm->usec = (time_t)((sec - tm->sec) * 1.0e6 + usec);
+  tm->usec = (time_t)llrint((sec - tm->sec) * 1.0e6 + usec);
   while (tm->usec < 0) {
     tm->sec--;
     tm->usec += 1000000;
   }
-  while (tm->usec > 1000000) {
+  while (tm->usec >= 1000000) {
     tm->sec++;
     tm->usec -= 1000000;
   }
-- 
cgit v1.2.3


From 47c61cf5027ed46a51ef0a261c3192700700a350 Mon Sep 17 00:00:00 2001
From: Lukas Joeressen <lukas@joeressen.net>
Date: Tue, 16 Jun 2015 09:24:27 +0200
Subject: Changed llrint to llround

---
 mrbgems/mruby-time/src/time.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mrbgems/mruby-time/src')

diff --git a/mrbgems/mruby-time/src/time.c b/mrbgems/mruby-time/src/time.c
index 36bbbe00a..da3451d22 100644
--- a/mrbgems/mruby-time/src/time.c
+++ b/mrbgems/mruby-time/src/time.c
@@ -4,9 +4,9 @@
 ** See Copyright Notice in mruby.h
 */
 
+#include <math.h>
 #include <stdio.h>
 #include <time.h>
-#include <math.h>
 #include "mruby.h"
 #include "mruby/class.h"
 #include "mruby/data.h"
@@ -209,7 +209,7 @@ time_alloc(mrb_state *mrb, double sec, double usec, enum mrb_timezone timezone)
   out_of_range:
     mrb_raisef(mrb, E_ARGUMENT_ERROR, "%S out of Time range", mrb_float_value(mrb, sec));
   }
-  tm->usec = (time_t)llrint((sec - tm->sec) * 1.0e6 + usec);
+  tm->usec = (time_t)llround((sec - tm->sec) * 1.0e6 + usec);
   while (tm->usec < 0) {
     tm->sec--;
     tm->usec += 1000000;
-- 
cgit v1.2.3


From 6a796cb4ccd53a35c93c89c1074d556186207966 Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby-lang.org>
Date: Wed, 17 Jun 2015 09:19:09 +0900
Subject: Added a check for 64 bit time_t overflow; based on a patch from
 @kext; close #2836

---
 mrbgems/mruby-time/src/time.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'mrbgems/mruby-time/src')

diff --git a/mrbgems/mruby-time/src/time.c b/mrbgems/mruby-time/src/time.c
index da3451d22..081e84c1c 100644
--- a/mrbgems/mruby-time/src/time.c
+++ b/mrbgems/mruby-time/src/time.c
@@ -201,11 +201,14 @@ time_alloc(mrb_state *mrb, double sec, double usec, enum mrb_timezone timezone)
   struct mrb_time *tm;
 
   tm = (struct mrb_time *)mrb_malloc(mrb, sizeof(struct mrb_time));
-  tm->sec  = (time_t)sec;
   if (sizeof(time_t) == 4 && (sec > (double)INT32_MAX || (double)INT32_MIN > sec)) {
     goto out_of_range;
   }
-  else if ((sec > 0 && tm->sec < 0) || (sec < 0 && (double)tm->sec > sec)) {
+  if (sizeof(time_t) == 8 && (sec > (double)INT64_MAX || (double)INT64_MIN > sec)) {
+    goto out_of_range;
+  }
+  tm->sec  = (time_t)sec;
+  if ((sec > 0 && tm->sec < 0) || (sec < 0 && (double)tm->sec > sec)) {
   out_of_range:
     mrb_raisef(mrb, E_ARGUMENT_ERROR, "%S out of Time range", mrb_float_value(mrb, sec));
   }
-- 
cgit v1.2.3


From 1167fd1ae440aa2b2b3d2cee5cb5a266d83f46e8 Mon Sep 17 00:00:00 2001
From: Yasuhiro Matsumoto <mattn.jp@gmail.com>
Date: Wed, 8 Jul 2015 18:25:52 +0900
Subject: use round for llround. some platform (ex: mingw32) doesn't have
 llround.

---
 mrbgems/mruby-time/src/time.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'mrbgems/mruby-time/src')

diff --git a/mrbgems/mruby-time/src/time.c b/mrbgems/mruby-time/src/time.c
index 081e84c1c..c18ac7568 100644
--- a/mrbgems/mruby-time/src/time.c
+++ b/mrbgems/mruby-time/src/time.c
@@ -11,6 +11,10 @@
 #include "mruby/class.h"
 #include "mruby/data.h"
 
+#if !defined(__MINGW64__) && defined(_WIN32)
+# define llround(x) round(x)
+#endif
+
 #if defined(__MINGW64__) || defined(__MINGW32__)
 # include <sys/time.h>
 #endif
-- 
cgit v1.2.3