From 8852fa876039ed177fd5e867f36177d8a9ff411c Mon Sep 17 00:00:00 2001
From: "NARUSE, Yui" <naruse@airemix.jp>
Date: Wed, 4 Dec 2019 01:26:29 +0900
Subject: Revert "Regexp#match{?} with nil raises TypeError as String, Symbol
 (#1506)"

This reverts commit 2a22a6b2d8465934e75520a7fdcf522d50890caf.
Revert [Feature #13083]
---
 re.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 're.c')

diff --git a/re.c b/re.c
index 6dfb9f273f..b15c3a07a8 100644
--- a/re.c
+++ b/re.c
@@ -3299,7 +3299,6 @@ rb_reg_match_m(int argc, VALUE *argv, VALUE re)
 	pos = 0;
     }
 
-    str = SYMBOL_P(str) ? rb_sym2str(str) : StringValue(str);
     pos = reg_match_pos(re, &str, pos);
     if (pos < 0) {
 	rb_backref_set(Qnil);
@@ -3345,6 +3344,7 @@ rb_reg_match_p(VALUE re, VALUE str, long pos)
     const UChar *start, *end;
     int tmpreg;
 
+    if (NIL_P(str)) return Qfalse;
     str = SYMBOL_P(str) ? rb_sym2str(str) : StringValue(str);
     if (pos) {
 	if (pos < 0) {
-- 
cgit v1.2.3