From 9e8f82e087ac7bc34098f94c2db5ea658dd6be80 Mon Sep 17 00:00:00 2001 From: akr Date: Fri, 2 Aug 2013 03:28:33 +0000 Subject: * bignum.c (bary_mul): Swap x and y for bary_mul1 if x is longer than y. [ruby-dev:47565] [Bug #8719] Reported by Narihiro Nakamura. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42324 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ bignum.c | 20 ++++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index cec7b5d291..d11f4c46dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Aug 2 12:25:15 2013 Tanaka Akira + + * bignum.c (bary_mul): Swap x and y for bary_mul1 if x is longer than y. + [ruby-dev:47565] [Bug #8719] Reported by Narihiro Nakamura. + Fri Aug 2 10:39:00 2013 Charlie Somerville * parse.y (negate_lit): add T_RATIONAL and T_COMPLEX to the switch diff --git a/bignum.c b/bignum.c index 0621180134..fffb65f01c 100644 --- a/bignum.c +++ b/bignum.c @@ -2559,12 +2559,20 @@ bary_mul_toom3_start(BDIGIT *zds, size_t zl, const BDIGIT *xds, size_t xl, const static void bary_mul(BDIGIT *zds, size_t zl, const BDIGIT *xds, size_t xl, const BDIGIT *yds, size_t yl) { - if (xl < KARATSUBA_MUL_DIGITS || yl < KARATSUBA_MUL_DIGITS) { - if (xds == yds && xl == yl) - bary_sq_fast(zds, zl, xds, xl); - else - bary_mul1(zds, zl, xds, xl, yds, yl); - return; + if (xl <= yl) { + if (yl < KARATSUBA_MUL_DIGITS) { + if (xds == yds && xl == yl) + bary_sq_fast(zds, zl, xds, xl); + else + bary_mul1(zds, zl, xds, xl, yds, yl); + return; + } + } + else { + if (xl < KARATSUBA_MUL_DIGITS) { + bary_mul1(zds, zl, yds, yl, xds, xl); + return; + } } bary_mul_toom3_start(zds, zl, xds, xl, yds, yl, NULL, 0); -- cgit v1.2.3