From 297ac0a672480e19ab666f81e47ee097f1d60a29 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 17 Jul 2013 02:01:42 +0000
Subject: merge revision(s) 36265: [Backport #8580]

	* ext/date/date_core.c: [ruby-core:46058].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@42017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/date/date_core.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'ext')

diff --git a/ext/date/date_core.c b/ext/date/date_core.c
index 634fe2f9d0..307cc47c59 100644
--- a/ext/date/date_core.c
+++ b/ext/date/date_core.c
@@ -991,8 +991,14 @@ safe_mul_p(VALUE x, long m)
     if (!FIXNUM_P(x))
 	return 0;
     ix = FIX2LONG(x);
-    if (ix >= (FIXNUM_MAX / m))
-	return 0;
+    if (ix < 0) {
+	if (ix <= (FIXNUM_MIN / m))
+	    return 0;
+    }
+    else {
+	if (ix >= (FIXNUM_MAX / m))
+	    return 0;
+    }
     return 1;
 }
 
-- 
cgit v1.2.3