summaryrefslogtreecommitdiff
path: root/re.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-06-04 13:09:57 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-06-04 13:09:57 (GMT)
commit5861d4f18b615d5eb9335de77b25337f8828da6c (patch)
treee22765faa4b1c2361f1f632fd9e0b503d57e56d1 /re.c
parentea0e8e61c06d5b069bf10bfd28be6257c340ae12 (diff)
re.c: consider name encoding
* re.c (match_aref, rb_reg_regsub): consider encoding of captured names, encoding-incompatible should not match. [ruby-dev:48278] [Bug #9903] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 're.c')
-rw-r--r--re.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/re.c b/re.c
index 4b28553..299d319 100644
--- a/re.c
+++ b/re.c
@@ -1796,9 +1796,9 @@ match_aref(int argc, VALUE *argv, VALUE match)
/* fall through */
case T_STRING:
p = StringValuePtr(idx);
- num = name_to_backref_number(RMATCH_REGS(match),
- RMATCH(match)->regexp, p, p + RSTRING_LEN(idx));
- if (num < 1) {
+ if (!rb_enc_compatible(RREGEXP(RMATCH(match)->regexp)->src, idx) ||
+ (num = name_to_backref_number(RMATCH_REGS(match), RMATCH(match)->regexp,
+ p, p + RSTRING_LEN(idx))) < 1) {
name_to_backref_error(idx);
}
return rb_reg_nth_match(num, match);
@@ -3417,9 +3417,10 @@ rb_reg_regsub(VALUE str, VALUE src, struct re_registers *regs, VALUE regexp)
name_end += c == -1 ? mbclen(name_end, e, str_enc) : clen;
}
if (name_end < e) {
- no = name_to_backref_number(regs, regexp, name, name_end);
- if (no < 1) {
- VALUE n = rb_str_subseq(str, (long)(name - RSTRING_PTR(str)), (long)(name_end - name));
+ VALUE n = rb_str_subseq(str, (long)(name - RSTRING_PTR(str)),
+ (long)(name_end - name));
+ if (!rb_enc_compatible(RREGEXP(regexp)->src, n) ||
+ (no = name_to_backref_number(regs, regexp, name, name_end)) < 1) {
name_to_backref_error(n);
}
p = s = name_end + clen;