diff options
| -rw-r--r-- | lib/time.rb | 11 | ||||
| -rw-r--r-- | test/test_time.rb | 4 | ||||
| -rw-r--r-- | version.h | 4 |
3 files changed, 16 insertions, 3 deletions
diff --git a/lib/time.rb b/lib/time.rb index 8058446a83..81c0ebd7ba 100644 --- a/lib/time.rb +++ b/lib/time.rb @@ -201,6 +201,9 @@ class Time end if yday + unless (1..366) === yday + raise ArgumentError, "yday #{yday} out of range" + end mon, day = (yday-1).divmod(31) mon += 1 day += 1 @@ -208,6 +211,12 @@ class Time diff = yday - t.yday return t if diff.zero? day += diff + if day > 28 and day > (mday = month_days(off_year, mon)) + if (mon += 1) > 12 + raise ArgumentError, "yday #{yday} out of range" + end + day -= mday + end return make_time(date, year, nil, mon, day, hour, min, sec, sec_fraction, zone, now) end @@ -433,7 +442,7 @@ class Time # def strptime(date, format, now=self.now) d = Date._strptime(date, format) - raise ArgumentError, "invalid strptime format - `#{format}'" unless d + raise ArgumentError, "invalid date or strptime format - `#{date}' `#{format}'" unless d if seconds = d[:seconds] if sec_fraction = d[:sec_fraction] usec = sec_fraction * 1000000 diff --git a/test/test_time.rb b/test/test_time.rb index 138766443b..fb30bea723 100644 --- a/test/test_time.rb +++ b/test/test_time.rb @@ -503,6 +503,10 @@ class TestTimeExtension < Test::Unit::TestCase # :nodoc: assert_equal(0, t.hour) assert_equal(0, t.min) assert_equal(0, t.sec) + t = Time.strptime("2018-091", "%Y-%j") + assert_equal(2018, t.year) + assert_equal(4, t.mon) + assert_equal(1, t.day) end def test_nsec @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.6.0" #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 9 +#define RUBY_PATCHLEVEL 10 #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 14 +#define RUBY_RELEASE_DAY 15 #include "ruby/version.h" |