diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-31 19:31:08 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-31 19:31:08 +0000 |
commit | e758c3fbce1b3be14660fcd0d1492ad6e91e01d6 (patch) | |
tree | 2d36be0eab147ad602abb48e78c9228a23c62a0c | |
parent | d245582dcb69922f3aa02c792e32f83f4e0743d2 (diff) | |
download | ruby-e758c3fbce1b3be14660fcd0d1492ad6e91e01d6.tar.gz |
* 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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | time.c | 8 |
2 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Thu Apr 1 04:30:11 2010 Tanaka Akira <akr@fsij.org> + + * time.c (long_mul): overflow condition changed. + (wi_mul): ditto. + Wed Mar 31 23:33:29 2010 Tanaka Akira <akr@fsij.org> * time.c (long_mul): extracted from mul and avoid integer overflow. @@ -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; |