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

merge revision(s) 57688,57689: [Backport #13242]

Browse source 
rational.c: infinity in power

	* rational.c (nurat_expt): return Infinity due to overflow.
	  [ruby-core:79686] [Bug #13242]:
	rational.c: infinity in power

	* rational.c (nurat_expt): return 0 due to overflow.
	  [ruby-core:79686] [Bug #13242]:

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@57911 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2017-03-12 14:18:02 +00:00
parent 3980985556
commit 0179055d2d
4 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
numeric.c
View file

@ -3904,6 +3904,8 @@ int_pow(long x, unsigned long y)
VALUE v; VALUE v;
bignum: bignum:
v = rb_big_pow(rb_int2big(x), LONG2NUM(y)); 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); if (z != 1) v = rb_big_mul(rb_int2big(neg ? -z : z), v);
return v; return v;
} }

8
rational.c
View file

@ -1039,6 +1039,14 @@ nurat_expt(VALUE self, VALUE other)
num = ONE; num = ONE;
den = ONE; den = ONE;
} }
if (RB_FLOAT_TYPE_P(num)) { /* infinity due to overflow */
if (RB_FLOAT_TYPE_P(den)) return DBL2NUM(NAN);
return num;
}
if (RB_FLOAT_TYPE_P(den)) { /* infinity due to overflow */
num = ZERO;
den = ONE;
}
return f_rational_new2(CLASS_OF(self), num, den); return f_rational_new2(CLASS_OF(self), num, den);
} }
} }

8
test/ruby/test_rational.rb
View file

@ -955,6 +955,14 @@ class Rational_Test < Test::Unit::TestCase
assert_raise(ZeroDivisionError, bug5713) { Rational(0, 1) ** Rational(-2,3) } assert_raise(ZeroDivisionError, bug5713) { Rational(0, 1) ** Rational(-2,3) }
end 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
x = EnvUtil.suppress_warning {(1/4r)**40000000}
assert_equal 0, x, bug
end
def test_positive_p def test_positive_p
assert_predicate(1/2r, :positive?) assert_predicate(1/2r, :positive?)
assert_not_predicate(-1/2r, :positive?) assert_not_predicate(-1/2r, :positive?)

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.4.0" #define RUBY_VERSION "2.4.0"
#define RUBY_RELEASE_DATE "2017-03-12" #define RUBY_RELEASE_DATE "2017-03-12"
#define RUBY_PATCHLEVEL 67 #define RUBY_PATCHLEVEL 68
#define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3