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

Raise proper exception when month argument is not a name

Browse source 
https://bugs.ruby-lang.org/issues/17485#change-89871
This commit is contained in:
Nobuyoshi Nakada 2021-12-25 16:19:33 +09:00
parent 42eb9bf37a
commit 0867b638af
Notes: git 2021-12-25 18:04:17 +09:00
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
test/ruby/test_time.rb
View file

@ -49,7 +49,10 @@ class TestTime < Test::Unit::TestCase
t = Time.new(*tm, "-12:00")
assert_equal([2001,2,28,23,59,30,-43200], [t.year, t.month, t.mday, t.hour, t.min, t.sec, t.gmt_offset], bug4090)
assert_raise(ArgumentError) { Time.new(2000,1,1, 0,0,0, "+01:60") }
assert_raise(ArgumentError) { Time.new(2021, 1, 1, "+09:99") }
msg = /invalid value for Integer/
assert_raise_with_message(ArgumentError, msg) { Time.new(2021, 1, 1, "+09:99") }
assert_raise_with_message(ArgumentError, msg) { Time.new(2021, 1, "+09:99") }
assert_raise_with_message(ArgumentError, msg) { Time.new(2021, "+09:99") }
end
def test_time_add()

12
time.c
View file

@ -2789,9 +2789,10 @@ month_arg(VALUE arg)
return obj2ubits(arg, 4);
}
mon = 0;
VALUE s = rb_check_string_type(arg);
if (!NIL_P(s) && RSTRING_LEN(s) > 0) {
mon = 0;
arg = s;
for (i=0; i<12; i++) {
if (RSTRING_LEN(s) == 3 &&
STRNCASECMP(months[i], RSTRING_PTR(s), 3) == 0) {
@ -2799,15 +2800,8 @@ month_arg(VALUE arg)
break;
}
}
if (mon == 0) {
char c = RSTRING_PTR(s)[0];
if ('0' <= c && c <= '9') {
mon = obj2ubits(s, 4);
}
}
}
else {
if (mon == 0) {
mon = obj2ubits(arg, 4);
}
return mon;