From 0867b638aff9ec192ca420a44ffa5a77c892e8f2 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Sat, 25 Dec 2021 16:19:33 +0900
Subject: Raise proper exception when month argument is not a name

https://bugs.ruby-lang.org/issues/17485#change-89871
---
 time.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'time.c')

diff --git a/time.c b/time.c
index 8f044e1e59..77f42fc89a 100644
--- a/time.c
+++ b/time.c
@@ -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;
-- 
cgit v1.2.1