diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-03-11 12:51:59 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-03-11 12:51:59 +0000 |
commit | d704a0fe3fafe1028fe57618d19a6de35b08cbf9 (patch) | |
tree | 88134fd0f5dd51e007df44047ddf1e159866f411 | |
parent | bdd97e5f38d6ef876a1ed1206f0d7ba3e7da9983 (diff) | |
download | ruby-d704a0fe3fafe1028fe57618d19a6de35b08cbf9.tar.gz |
merge revision(s) 67203: [Backport #15651]
numeric.c: fix infinite loop
* numeric.c (int_pow): fix infinite loop in the case of y equal 1
and power of x does not overflow.
[ruby-core:91734] [Bug #15651]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@67219 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ext/-test-/integer/core_ext.c | 7 | ||||
-rw-r--r-- | numeric.c | 1 | ||||
-rw-r--r-- | test/-ext-/integer/test_integer.rb | 11 | ||||
-rw-r--r-- | version.h | 6 |
4 files changed, 22 insertions, 3 deletions
diff --git a/ext/-test-/integer/core_ext.c b/ext/-test-/integer/core_ext.c index 6d64cdb0c2..510ba4a1e6 100644 --- a/ext/-test-/integer/core_ext.c +++ b/ext/-test-/integer/core_ext.c @@ -20,10 +20,17 @@ rb_int_to_bignum(VALUE x) return x; } +static VALUE +positive_pow(VALUE x, VALUE y) +{ + return rb_int_positive_pow(NUM2LONG(x), NUM2ULONG(y)); +} + void Init_core_ext(VALUE klass) { rb_define_method(rb_cInteger, "bignum?", int_bignum_p, 0); rb_define_method(rb_cInteger, "fixnum?", int_fixnum_p, 0); rb_define_method(rb_cInteger, "to_bignum", rb_int_to_bignum, 0); + rb_define_method(rb_cInteger, "positive_pow", positive_pow, 1); } @@ -3905,6 +3905,7 @@ int_pow(long x, unsigned long y) long z = 1; if (y == 0) return INT2FIX(1); + if (y == 1) return LONG2NUM(x); if (neg) x = -x; if (y & 1) z = x; diff --git a/test/-ext-/integer/test_integer.rb b/test/-ext-/integer/test_integer.rb index 320237791a..8ac0583a9f 100644 --- a/test/-ext-/integer/test_integer.rb +++ b/test/-ext-/integer/test_integer.rb @@ -12,4 +12,15 @@ class TestInteger < Test::Unit::TestCase assert_fixnum(FIXNUM_MAX) assert_bignum(FIXNUM_MAX+1) end + + def test_positive_pow + assert_separately(%w[-r-test-/integer], "#{<<~"begin;"}\n#{<<~'end;'}", timeout: 3) + begin; + assert_equal(1, 1.positive_pow(1)) + assert_equal(0, 0.positive_pow(1)) + assert_equal(3, 3.positive_pow(1)) + assert_equal(-3, -3.positive_pow(1)) + assert_equal(9, -3.positive_pow(2)) + end; + end end @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.5.4" -#define RUBY_RELEASE_DATE "2019-03-08" -#define RUBY_PATCHLEVEL 143 +#define RUBY_RELEASE_DATE "2019-03-11" +#define RUBY_PATCHLEVEL 144 #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 8 +#define RUBY_RELEASE_DAY 11 #include "ruby/version.h" |