From 356d61050c95af7b25fc844ad2125cc3eced4f06 Mon Sep 17 00:00:00 2001 From: matz Date: Fri, 13 Jul 2007 16:46:39 +0000 Subject: * numeric.c (int_pow): wrong overflow detection. [ruby-dev:31213] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@12774 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- numeric.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'numeric.c') diff --git a/numeric.c b/numeric.c index f0b827aacc..c4210279a4 100644 --- a/numeric.c +++ b/numeric.c @@ -2197,16 +2197,18 @@ int_pow(x, y) while (y % 2 == 0) { long x2 = x * x; if (x2 < x || !POSFIXABLE(x2)) { + VALUE v; bignum: - return rb_big_mul(rb_big_pow(rb_int2big(x), LONG2NUM(y)), - rb_int2big(neg ? -z : z)); + v = rb_big_pow(rb_int2big(x), LONG2NUM(y)); + if (z != 1) v = rb_big_mul(rb_int2big(neg ? -z : z), v); + return v; } x = x2; y >>= 1; } { long xz = x * z; - if (xz < z || xz < x || !POSFIXABLE(xz)) { + if (!POSFIXABLE(xz) || xz / x != z) { goto bignum; } z = xz; -- cgit v1.2.3