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

merge revision(s) 40208: [Backport #8380]

Browse source 
* internal.h (MUL_OVERFLOW_SIGNED_INTEGER_P): New macro.
	  (MUL_OVERFLOW_FIXNUM_P): Ditto.
	  (MUL_OVERFLOW_LONG_P): Ditto.

	* array.c (rb_ary_product): Don't overflow on signed integer
	  multiplication.

	* numeric.c (fix_mul): Ditto.
	  (int_pow): Ditto.

	* rational.c (f_imul): Ditto.

	* insns.def (opt_mult): Ditto.

	* thread.c (sleep_timeval): Don't overflow on signed integer addition.

	* bignum.c (rb_int2big): Don't overflow on signed integer negation.
	  (rb_big2ulong): Ditto.
	  (rb_big2long): Ditto.
	  (rb_big2ull): Ditto.
	  (rb_big2ll): Ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40602 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2013-05-07 16:49:01 +00:00
parent b6f0a306a6
commit 555035a349
9 changed files with 108 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

14
numeric.c
View file

@ -2694,7 +2694,6 @@ fix_mul(VALUE x, VALUE y)
#if SIZEOF_LONG * 2 <= SIZEOF_LONG_LONG
LONG_LONG d;
#else
volatile long c;
VALUE r;
#endif
@ -2708,13 +2707,11 @@ fix_mul(VALUE x, VALUE y)
#else
if (FIT_SQRT_LONG(a) && FIT_SQRT_LONG(b))
return LONG2FIX(a*b);
c = a * b;
r = LONG2FIX(c);
if (a == 0) return x;
if (FIX2LONG(r) != c || c/a != b) {
if (MUL_OVERFLOW_FIXNUM_P(a, b))
r = rb_big_mul(rb_int2big(a), rb_int2big(b));
}
else
r = LONG2FIX(a * b);
return r;
#endif
}
@ -2936,11 +2933,10 @@ int_pow(long x, unsigned long y)
y >>= 1;
}
{
volatile long xz = x * z;
if (!POSFIXABLE(xz) || xz / x != z) {
if (MUL_OVERFLOW_FIXNUM_P(x, z)) {
goto bignum;
}
z = xz;
z = x * z;
}
} while (--y);
if (neg) z = -z;