diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/date/date_core.c | 10 | ||||
| -rw-r--r-- | test/date/test_switch_hitter.rb | 2 |
3 files changed, 14 insertions, 2 deletions
@@ -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 8096fd7bfb..e44c6474c4 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 273474eb86..7f81ab7568 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 |