diff options
| -rw-r--r-- | numeric.c | 2 | ||||
| -rw-r--r-- | rational.c | 4 | ||||
| -rw-r--r-- | test/ruby/test_rational.rb | 6 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 13 insertions, 1 deletions
@@ -3158,6 +3158,8 @@ int_pow(long x, unsigned long y) VALUE v; bignum: v = rb_big_pow(rb_int2big(x), LONG2NUM(y)); + if (RB_FLOAT_TYPE_P(v)) /* infinity due to overflow */ + return v; if (z != 1) v = rb_big_mul(rb_int2big(neg ? -z : z), v); return v; } diff --git a/rational.c b/rational.c index 3e5dea3349..97d9b35a16 100644 --- a/rational.c +++ b/rational.c @@ -1043,6 +1043,10 @@ nurat_expt(VALUE self, VALUE other) den = ONE; break; } + if (RB_FLOAT_TYPE_P(num)) { /* infinity due to overflow */ + if (RB_FLOAT_TYPE_P(den)) return DBL2NUM(NAN); + return num; + } return f_rational_new2(CLASS_OF(self), num, den); } } diff --git a/test/ruby/test_rational.rb b/test/ruby/test_rational.rb index 44f7280071..76850053e6 100644 --- a/test/ruby/test_rational.rb +++ b/test/ruby/test_rational.rb @@ -931,6 +931,12 @@ class Rational_Test < Test::Unit::TestCase assert_raise(ZeroDivisionError, bug5713) { Rational(0, 1) ** Rational(-2,3) } end + def test_power_overflow + bug = '[ruby-core:79686] [Bug #13242]: Infinity due to overflow' + x = EnvUtil.suppress_warning {4r**40000000} + assert_predicate x, :infinite?, bug + end + def test_known_bug end @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.7" #define RUBY_RELEASE_DATE "2017-03-26" -#define RUBY_PATCHLEVEL 449 +#define RUBY_PATCHLEVEL 450 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 3 |