From 397f1fc94631072b76c750c1be3b809ad6dbc060 Mon Sep 17 00:00:00 2001 From: ksss Date: Tue, 28 Mar 2017 10:58:18 +0900 Subject: Fix infinity loop And some cases should raise FloatDomainError --- mrbgems/mruby-time/src/time.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'mrbgems/mruby-time/src') diff --git a/mrbgems/mruby-time/src/time.c b/mrbgems/mruby-time/src/time.c index 43d87e5ff..7e5f68f43 100644 --- a/mrbgems/mruby-time/src/time.c +++ b/mrbgems/mruby-time/src/time.c @@ -211,6 +211,16 @@ mrb_time_wrap(mrb_state *mrb, struct RClass *tc, struct mrb_time *tm) return mrb_obj_value(Data_Wrap_Struct(mrb, tc, &mrb_time_type, tm)); } +static void +check_num_exact(mrb_state *mrb, double num) +{ + if (isinf(num)) { + mrb_raise(mrb, E_FLOATDOMAIN_ERROR, num < 0 ? "-Infinity" : "Infinity"); + } + if (isnan(num)) { + mrb_raise(mrb, E_FLOATDOMAIN_ERROR, "NaN"); + } +} /* Allocates a mrb_time object and initializes it. */ static struct mrb_time* @@ -219,6 +229,9 @@ time_alloc(mrb_state *mrb, double sec, double usec, enum mrb_timezone timezone) struct mrb_time *tm; time_t tsec = 0; + check_num_exact(mrb, sec); + check_num_exact(mrb, usec); + if (sizeof(time_t) == 4 && (sec > (double)INT32_MAX || (double)INT32_MIN > sec)) { goto out_of_range; } -- cgit v1.2.3