From e758c3fbce1b3be14660fcd0d1492ad6e91e01d6 Mon Sep 17 00:00:00 2001 From: akr Date: Wed, 31 Mar 2010 19:31:08 +0000 Subject: [PATCH] * time.c (long_mul): overflow condition changed. (wi_mul): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27132 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ time.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5f187e9780..d7231176b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Apr 1 04:30:11 2010 Tanaka Akira + + * time.c (long_mul): overflow condition changed. + (wi_mul): ditto. + Wed Mar 31 23:33:29 2010 Tanaka Akira * time.c (long_mul): extracted from mul and avoid integer overflow. diff --git a/time.c b/time.c index 05b7cd88f6..a3195e27a2 100644 --- a/time.c +++ b/time.c @@ -103,8 +103,8 @@ long_mul(long x, long y, long *z) else { b = (unsigned long)y; } - c = a * b; - if (c / b == a) { + if (a <= ULONG_MAX / b) { + c = a * b; if (s < 0) { if (c <= (unsigned long)LONG_MAX + 1) { *z = -(long)c; @@ -478,8 +478,8 @@ wi_mul(wideint_t x, wideint_t y, wideint_t *z) else { b = (uwideint_t)y; } - c = a * b; - if (c / b == a) { + if (a <= UWIDEINT_MAX / b) { + c = a * b; if (s < 0) { if (c <= (uwideint_t)WIDEINT_MAX + 1) { *z = -(wideint_t)c;