diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2017-03-28 14:47:23 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-03-28 14:47:23 +0900 |
| commit | 0f5289326f1f501cc368406880244fc78d09533f (patch) | |
| tree | b914ec5a662a862f9017678610217f1c2eda1b34 | |
| parent | 66980493ae2f4d587a4a45b6b1061f46c01e34be (diff) | |
| parent | 397f1fc94631072b76c750c1be3b809ad6dbc060 (diff) | |
| download | mruby-0f5289326f1f501cc368406880244fc78d09533f.tar.gz mruby-0f5289326f1f501cc368406880244fc78d09533f.zip | |
Merge pull request #3552 from ksss/time
Fix infinity loop ref #3546
| -rw-r--r-- | mrbgems/mruby-time/src/time.c | 13 | ||||
| -rw-r--r-- | mrbgems/mruby-time/test/time.rb | 21 |
2 files changed, 31 insertions, 3 deletions
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; } diff --git a/mrbgems/mruby-time/test/time.rb b/mrbgems/mruby-time/test/time.rb index 759e2881d..52b931177 100644 --- a/mrbgems/mruby-time/test/time.rb +++ b/mrbgems/mruby-time/test/time.rb @@ -10,7 +10,14 @@ assert('Time', '15.2.19') do end assert('Time.at', '15.2.19.6.1') do - Time.at(1300000000.0) + assert_kind_of(Time, Time.at(1300000000.0)) + + assert_raise(FloatDomainError) { Time.at(Float::NAN) } + assert_raise(FloatDomainError) { Time.at(Float::INFINITY) } + assert_raise(FloatDomainError) { Time.at(-Float::INFINITY) } + assert_raise(FloatDomainError) { Time.at(0, Float::NAN) } + assert_raise(FloatDomainError) { Time.at(0, Float::INFINITY) } + assert_raise(FloatDomainError) { Time.at(0, -Float::INFINITY) } end assert('Time.gm', '15.2.19.6.2') do @@ -37,14 +44,22 @@ assert('Time#+', '15.2.19.7.1') do t1 = Time.at(1300000000.0) t2 = t1.+(60) - t2.utc.asctime == "Sun Mar 13 07:07:40 UTC 2011" + assert_equal(t2.utc.asctime, "Sun Mar 13 07:07:40 UTC 2011") + + assert_raise(FloatDomainError) { Time.at(0) + Float::NAN } + assert_raise(FloatDomainError) { Time.at(0) + Float::INFINITY } + assert_raise(FloatDomainError) { Time.at(0) + -Float::INFINITY } end assert('Time#-', '15.2.19.7.2') do t1 = Time.at(1300000000.0) t2 = t1.-(60) - t2.utc.asctime == "Sun Mar 13 07:05:40 UTC 2011" + assert_equal(t2.utc.asctime, "Sun Mar 13 07:05:40 UTC 2011") + + assert_raise(FloatDomainError) { Time.at(0) - Float::NAN } + assert_raise(FloatDomainError) { Time.at(0) - Float::INFINITY } + assert_raise(FloatDomainError) { Time.at(0) - -Float::INFINITY } end assert('Time#<=>', '15.2.19.7.3') do |