diff options
| -rw-r--r-- | string.c | 11 | ||||
| -rw-r--r-- | test/ruby/test_string.rb | 8 |
2 files changed, 16 insertions, 3 deletions
@@ -3893,9 +3893,14 @@ rb_pat_search(VALUE pat, VALUE str, long pos, int set_backref_str) { if (BUILTIN_TYPE(pat) == T_STRING) { pos = rb_str_index(str, pat, pos); - if (pos >= 0 && set_backref_str) { - str = rb_str_new_frozen(str); - rb_backref_set_string(str, pos, RSTRING_LEN(pat)); + if (set_backref_str) { + if (pos >= 0) { + str = rb_str_new_frozen(str); + rb_backref_set_string(str, pos, RSTRING_LEN(pat)); + } + else { + rb_backref_set(Qnil); + } } return pos; } diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb index 5c8c4184a0..62402353a7 100644 --- a/test/ruby/test_string.rb +++ b/test/ruby/test_string.rb @@ -1147,6 +1147,14 @@ class TestString < Test::Unit::TestCase res = [] a.scan(/./) { |w| res << w } assert_predicate(res[0], :tainted?, '[ruby-core:33338] #4087') + + /h/ =~ a + a.scan(/x/) + assert_nil($~) + + /h/ =~ a + a.scan('x') + assert_nil($~) end def test_size |