From 95fa22a65cf0866afaf3efd933a180509922f047 Mon Sep 17 00:00:00 2001 From: Lukas Joeressen 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/time.c') 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 #include +#include #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 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/time.c') 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 #include #include -#include #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