summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-07-01 20:56:50 +0000
committertadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-07-01 20:56:50 +0000
commitbd52bed97be25e8f3344033ac01416349ec8be67 (patch)
treec5c4f0a5dde4d00d9878819587c70dd0c3eb65ea
parentc8cde4e2be5a1cdc151e436d6d2189314902d748 (diff)
* ext/date/date_core.c: [ruby-core:46058].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36265 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/date/date_core.c10
-rw-r--r--test/date/test_switch_hitter.rb2
3 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5507fc0..017fedf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jul 2 05:54:58 2012 Tadayoshi Funaba <tadf@dotrb.org>
+
+ * ext/date/date_core.c: [ruby-core:46058].
+
Mon Jul 2 05:35:43 2012 Tadayoshi Funaba <tadf@dotrb.org>
* ext/date/date_core.c (d_lite_marshal_load): accepts old dump.
diff --git a/ext/date/date_core.c b/ext/date/date_core.c
index 8096fd7..e44c647 100644
--- a/ext/date/date_core.c
+++ b/ext/date/date_core.c
@@ -980,8 +980,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;
}
diff --git a/test/date/test_switch_hitter.rb b/test/date/test_switch_hitter.rb
index 273474e..7f81ab7 100644
--- a/test/date/test_switch_hitter.rb
+++ b/test/date/test_switch_hitter.rb
@@ -294,6 +294,8 @@ class TestSH < Test::Unit::TestCase
assert_raise(Errno::ERANGE) do
Date.new(1 << 10000).strftime('%Y')
end
+ assert_equal('-3786825600', Date.new(1850).strftime('%s'))
+ assert_equal('-3786825600000', Date.new(1850).strftime('%Q'))
end
def test_cmp