kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

numeric.c: fix infinite loop

Browse source 
* 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/trunk@67203 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2019-03-11 01:37:16 +00:00
parent f399c2912b
commit e5f01dab9d
3 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ext/-test-/integer/core_ext.c
View file

@ -20,10 +20,17 @@ rb_int_to_bignum(VALUE x)
return x; return x;
} }
static VALUE
positive_pow(VALUE x, VALUE y)
{
return rb_int_positive_pow(NUM2LONG(x), NUM2ULONG(y));
}
void void
Init_core_ext(VALUE klass) Init_core_ext(VALUE klass)
{ {
rb_define_method(rb_cInteger, "bignum?", int_bignum_p, 0); 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, "fixnum?", int_fixnum_p, 0);
rb_define_method(rb_cInteger, "to_bignum", rb_int_to_bignum, 0); rb_define_method(rb_cInteger, "to_bignum", rb_int_to_bignum, 0);
rb_define_method(rb_cInteger, "positive_pow", positive_pow, 1);
} }

1
numeric.c
View file

@ -3988,6 +3988,7 @@ int_pow(long x, unsigned long y)
long z = 1; long z = 1;
if (y == 0) return INT2FIX(1); if (y == 0) return INT2FIX(1);
if (y == 1) return LONG2NUM(x);
if (neg) x = -x; if (neg) x = -x;
if (y & 1) if (y & 1)
z = x; z = x;

11
test/-ext-/integer/test_integer.rb
View file

@ -12,4 +12,15 @@ class Test_Integer < Test::Unit::TestCase
assert_fixnum(FIXNUM_MAX) assert_fixnum(FIXNUM_MAX)
assert_bignum(FIXNUM_MAX+1) assert_bignum(FIXNUM_MAX+1)
end 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 end