kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Normalize month-mday before finding epoch

Browse source 
Especially over the year 2038, 30 Feb and so on may cause odd behavior
on validating found epoch with given year-month-day [Bug #15340]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65974 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2018-11-25 16:23:18 +00:00
parent dd78257919
commit 2c652768a8
2 changed files with 46 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
test/ruby/test_time.rb
View file

@ -1056,6 +1056,29 @@ class TestTime < Test::Unit::TestCase
assert_equal(min, t.min) assert_equal(min, t.min)
assert_equal(sec, t.sec) assert_equal(sec, t.sec)
} }
assert_equal(Time.local(2038,3,1), Time.local(2038,2,29))
assert_equal(Time.local(2038,3,2), Time.local(2038,2,30))
assert_equal(Time.local(2038,3,3), Time.local(2038,2,31))
assert_equal(Time.local(2040,2,29), Time.local(2040,2,29))
assert_equal(Time.local(2040,3,1), Time.local(2040,2,30))
assert_equal(Time.local(2040,3,2), Time.local(2040,2,31))
n = 2 ** 64
n += 400 - n % 400 # n is over 2^64 and multiple of 400
assert_equal(Time.local(n,2,29),Time.local(n,2,29))
assert_equal(Time.local(n,3,1), Time.local(n,2,30))
assert_equal(Time.local(n,3,2), Time.local(n,2,31))
n += 100
assert_equal(Time.local(n,3,1), Time.local(n,2,29))
assert_equal(Time.local(n,3,2), Time.local(n,2,30))
assert_equal(Time.local(n,3,3), Time.local(n,2,31))
n += 4
assert_equal(Time.local(n,2,29),Time.local(n,2,29))
assert_equal(Time.local(n,3,1), Time.local(n,2,30))
assert_equal(Time.local(n,3,2), Time.local(n,2,31))
n += 1
assert_equal(Time.local(n,3,1), Time.local(n,2,29))
assert_equal(Time.local(n,3,2), Time.local(n,2,30))
assert_equal(Time.local(n,3,3), Time.local(n,2,31))
end end
def test_future def test_future

23
time.c
View file

@ -2876,6 +2876,29 @@ time_arg(int argc, const VALUE *argv, struct vtm *vtm)
vtm->mday = obj2ubits(v[2], 5); vtm->mday = obj2ubits(v[2], 5);
} }
/* normalize month-mday */
switch (vtm->mon) {
case 2:
{
/* this drops higher bits but it's not a problem to calc leap year */
unsigned int mday2 = leap_year_v_p(vtm->year) ? 29 : 28;
if (vtm->mday > mday2) {
vtm->mday -= mday2;
vtm->mon++;
}
}
break;
case 4:
case 6:
case 9:
case 11:
if (vtm->mday == 31) {
vtm->mon++;
vtm->mday = 1;
}
break;
}
vtm->hour = NIL_P(v[3])?0:obj2ubits(v[3], 5); vtm->hour = NIL_P(v[3])?0:obj2ubits(v[3], 5);
vtm->min = NIL_P(v[4])?0:obj2ubits(v[4], 6); vtm->min = NIL_P(v[4])?0:obj2ubits(v[4], 6);