summaryrefslogtreecommitdiff
path: root/time.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-03-31 19:31:08 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-03-31 19:31:08 +0000
commite758c3fbce1b3be14660fcd0d1492ad6e91e01d6 (patch)
tree2d36be0eab147ad602abb48e78c9228a23c62a0c /time.c
parentd245582dcb69922f3aa02c792e32f83f4e0743d2 (diff)
* 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
Diffstat (limited to 'time.c')
-rw-r--r--time.c8
1 files changed, 4 insertions, 4 deletions
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;