summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-03-28 02:28:18 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-03-28 02:28:18 +0000
commit9d1bf5b33a118c65772f791cfc43276c070b1892 (patch)
treee2211a38dc6a6f23111226e987f8042a3abc6147
parent2f14bde88fc25fd49c5d72bac71e1f0381df944a (diff)
string.c: infect match result
* string.c (rb_pat_search): match result should be infected by the pattern. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45460 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--re.c1
-rw-r--r--string.c3
-rw-r--r--test/ruby/test_string.rb2
3 files changed, 6 insertions, 0 deletions
diff --git a/re.c b/re.c
index 70194be87eb..89910f67b40 100644
--- a/re.c
+++ b/re.c
@@ -1235,6 +1235,7 @@ match_set_string(VALUE m, VALUE string, long pos, long len)
rmatch->regs.beg[0] = pos;
rmatch->regs.end[0] = pos + len;
rmatch->char_offset_updated = 0;
+ OBJ_INFECT(match, string);
}
void
diff --git a/string.c b/string.c
index 8b5c1f65302..46cccac6e80 100644
--- a/string.c
+++ b/string.c
@@ -3895,8 +3895,11 @@ rb_pat_search(VALUE pat, VALUE str, long pos, int set_backref_str)
pos = rb_str_index(str, pat, pos);
if (set_backref_str) {
if (pos >= 0) {
+ VALUE match;
str = rb_str_new_frozen(str);
rb_backref_set_string(str, pos, RSTRING_LEN(pat));
+ match = rb_backref_get();
+ OBJ_INFECT(match, pat);
}
else {
rb_backref_set(Qnil);
diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb
index 5ee026c3272..a35f6a3bb7d 100644
--- a/test/ruby/test_string.rb
+++ b/test/ruby/test_string.rb
@@ -1156,6 +1156,8 @@ class TestString < Test::Unit::TestCase
/h/ =~ a
a.scan('x')
assert_nil($~)
+
+ assert_equal(3, S("hello hello hello").scan("hello".taint).count(&:tainted?))
end
def test_size