merge revision(s) 99d8c4832a7133ca52578d015e3ddcfd94820f4a: [Backport #18160]

	Preserve the encoding of the argument in IndexError [Bug #18160]

	---
	 re.c                     | 20 ++++++++++----------
	 test/ruby/test_regexp.rb |  7 ++++++-
	 2 files changed, 16 insertions(+), 11 deletions(-)

1 files changed, 10 insertions, 10 deletions

diff --git a/re.c b/re.c
index a56b483513..f3e8954185 100644
--- a/re.c
+++ b/re.c
@@ -1151,6 +1151,14 @@ match_size(VALUE match)
 }
 
 static int name_to_backref_number(struct re_registers *, VALUE, const char*, const char*);
+NORETURN(static void name_to_backref_error(VALUE name));
+
+static void
+name_to_backref_error(VALUE name)
+{
+    rb_raise(rb_eIndexError, "undefined group name reference: % "PRIsVALUE,
+	     name);
+}
 
 static int
 match_backref_number(VALUE match, VALUE backref)
@@ -1170,10 +1178,10 @@ match_backref_number(VALUE match, VALUE backref)
     }
     name = StringValueCStr(backref);
 
-    num = name_to_backref_number(regs, regexp, name, name + strlen(name));
+    num = name_to_backref_number(regs, regexp, name, name + RSTRING_LEN(backref));
 
     if (num < 1) {
-        rb_raise(rb_eIndexError, "undefined group name reference: %s", name);
+        name_to_backref_error(backref);
     }
 
     return num;
@@ -1928,14 +1936,6 @@ name_to_backref_number(struct re_registers *regs, VALUE regexp, const char* name
 	(const unsigned char *)name, (const unsigned char *)name_end, regs);
 }
 
-NORETURN(static void name_to_backref_error(VALUE name));
-static void
-name_to_backref_error(VALUE name)
-{
-    rb_raise(rb_eIndexError, "undefined group name reference: % "PRIsVALUE,
-	     name);
-}
-
 #define NAME_TO_NUMBER(regs, re, name, name_ptr, name_end)	\
     (NIL_P(re) ? 0 : \
      !rb_enc_compatible(RREGEXP_SRC(re), (name)) ? 0 : \