summaryrefslogtreecommitdiff
path: root/re.c
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-01-16 19:34:52 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-01-16 19:34:52 +0000
commitf6e44a2a5a8d51b7991822118e3c7dc5d2e06146 (patch)
tree780a4db6a66286b4a0841d03bfca9b142f448112 /re.c
parentf327b5e23ce39b3dbe9ada818232731d7c70e39b (diff)
merge revision(s) 57098: [Backport #13042]
re.c: non-regexp name reference * re.c (rb_reg_regsub): other than regexp has no name references. [ruby-core:78686] [Bug #13042] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@57349 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 're.c')
-rw-r--r--re.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/re.c b/re.c
index c1cf3d8762..20bbede103 100644
--- a/re.c
+++ b/re.c
@@ -3465,7 +3465,8 @@ rb_reg_regsub(VALUE str, VALUE src, struct re_registers *regs, VALUE regexp)
if (name_end < e) {
VALUE n = rb_str_subseq(str, (long)(name - RSTRING_PTR(str)),
(long)(name_end - name));
- if (!rb_enc_compatible(RREGEXP(regexp)->src, n) ||
+ if (NIL_P(regexp) ||
+ !rb_enc_compatible(RREGEXP(regexp)->src, n) ||
(no = name_to_backref_number(regs, regexp, name, name_end)) < 1) {
name_to_backref_error(n);
}