From 4e28fdf417fcd2d9492277b46a556264ab9ba0de Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 12 Jan 2019 09:36:52 +0000 Subject: No FloatDomainError at non-finitive number if exception: false [ruby-core:91021] [Bug #15525] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66797 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- object.c | 1 + test/ruby/test_integer.rb | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/object.c b/object.c index af8f8aee38..9029dad99c 100644 --- a/object.c +++ b/object.c @@ -3159,6 +3159,7 @@ rb_convert_to_integer(VALUE val, int base, int raise_exception) double f; if (base != 0) goto arg_error; f = RFLOAT_VALUE(val); + if (!raise_exception && !isfinite(f)) return Qnil; if (FIXABLE(f)) return LONG2FIX((long)f); return rb_dbl2big(f); } diff --git a/test/ruby/test_integer.rb b/test/ruby/test_integer.rb index a73992787d..69347b6b11 100644 --- a/test/ruby/test_integer.rb +++ b/test/ruby/test_integer.rb @@ -175,6 +175,15 @@ class TestInteger < Test::Unit::TestCase def o.to_int; raise; end assert_equal(nil, Integer(o, exception: false)) } + assert_nothing_raised(FloatDomainError) { + assert_equal(nil, Integer(Float::INFINITY, exception: false)) + } + assert_nothing_raised(FloatDomainError) { + assert_equal(nil, Integer(-Float::INFINITY, exception: false)) + } + assert_nothing_raised(FloatDomainError) { + assert_equal(nil, Integer(Float::NAN, exception: false)) + } assert_raise(ArgumentError) { Integer("1z", exception: true) -- cgit v1.2.3