archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 09:33:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

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_2@58117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2017-03-25 18:16:16 +00:00
parent d410184643
commit f84d286415
4 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
numeric.c
View file

@ -3158,6 +3158,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;
} }

4
rational.c
View file

@ -1043,6 +1043,10 @@ nurat_expt(VALUE self, VALUE other)
den = ONE; den = ONE;
break; 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); return f_rational_new2(CLASS_OF(self), num, den);
} }
} }

6
test/ruby/test_rational.rb
View file

@ -931,6 +931,12 @@ 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
end
def test_known_bug def test_known_bug
end end

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.7" #define RUBY_VERSION "2.2.7"
#define RUBY_RELEASE_DATE "2017-03-26" #define RUBY_RELEASE_DATE "2017-03-26"
#define RUBY_PATCHLEVEL 449 #define RUBY_PATCHLEVEL 450
#define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3