kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

string.c: unset $~ if unmatch

Browse source 
* string.c (rb_pat_search): unset $~ if the last match failed.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45458 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-03-28 02:27:14 +00:00
parent 209a310c47
commit 2d82342cf2
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
string.c
View file

@ -3893,9 +3893,14 @@ rb_pat_search(VALUE pat, VALUE str, long pos, int set_backref_str)
{ {
if (BUILTIN_TYPE(pat) == T_STRING) { if (BUILTIN_TYPE(pat) == T_STRING) {
pos = rb_str_index(str, pat, pos); pos = rb_str_index(str, pat, pos);
if (pos >= 0 && set_backref_str) { if (set_backref_str) {
str = rb_str_new_frozen(str); if (pos >= 0) {
rb_backref_set_string(str, pos, RSTRING_LEN(pat)); str = rb_str_new_frozen(str);
rb_backref_set_string(str, pos, RSTRING_LEN(pat));
}
else {
rb_backref_set(Qnil);
}
} }
return pos; return pos;
} }

8
test/ruby/test_string.rb
View file

@ -1147,6 +1147,14 @@ class TestString < Test::Unit::TestCase
res = [] res = []
a.scan(/./) { |w| res << w } a.scan(/./) { |w| res << w }
assert_predicate(res[0], :tainted?, '[ruby-core:33338] #4087') assert_predicate(res[0], :tainted?, '[ruby-core:33338] #4087')
/h/ =~ a
a.scan(/x/)
assert_nil($~)
/h/ =~ a
a.scan('x')
assert_nil($~)
end end
def test_size def test_size