diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-08-31 07:19:09 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-08-31 07:19:09 +0000 |
commit | 6ffd2d5df78181a529bf7cfc71de79559d51d489 (patch) | |
tree | 2de3a65baf014ada2cdf9a374f7d6919d08f9ec1 /re.c | |
parent | a102b685b93f0ce944c273e24f7d100e85777426 (diff) |
merge revision(s) 46344: [Backport #9902]
* re.c (match_aref): should not ignore name after NUL byte.
[ruby-dev:48275] [Bug #9902]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47334 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 're.c')
-rw-r--r-- | re.c | 10 |
1 files changed, 3 insertions, 7 deletions
@@ -1728,17 +1728,13 @@ match_aref(int argc, VALUE *argv, VALUE match) switch (TYPE(idx)) { case T_SYMBOL: - p = rb_id2name(SYM2ID(idx)); - goto name_to_backref; - break; + idx = rb_id2str(SYM2ID(idx)); + /* fall through */ case T_STRING: p = StringValuePtr(idx); - - name_to_backref: num = name_to_backref_number(RMATCH_REGS(match), - RMATCH(match)->regexp, p, p + strlen(p)); + RMATCH(match)->regexp, p, p + RSTRING_LEN(idx)); return rb_reg_nth_match(num, match); - break; default: break; |