summaryrefslogtreecommitdiff
path: root/re.c
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-04 06:34:08 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-04 06:34:08 +0000
commit1a70fe690870fc90bdd7702f9637cd953ad6a522 (patch)
tree20d84e434e5c57ecfd8c8e0cd1d027b31b2666fb /re.c
parentde7048ce904132c1e80d3a66ea1ae02cb93c5216 (diff)
merge revision(s) 29933:
* re.c (rb_reg_regcomp): should succeed the taint status from the origin. [ruby-core:33338] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29933 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@30080 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 're.c')
-rw-r--r--re.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/re.c b/re.c
index f2ac99f9ff..4e909ebded 100644
--- a/re.c
+++ b/re.c
@@ -1506,6 +1506,7 @@ rb_reg_regcomp(str)
case_cache = ruby_ignorecase;
kcode_cache = reg_kcode;
reg_cache = rb_reg_new(RSTRING(str)->ptr, RSTRING(str)->len, ruby_ignorecase);
+ OBJ_INFECT(reg_cache, str);
RB_GC_GUARD(save_str);
return reg_cache;
}