summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--re.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a5111d22c6..a69bddd0c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov 26 10:08:24 2010 NAKAMURA Usaku <[email protected]>
+
+ * re.c (rb_reg_regcomp): should succeed the taint status from the
+ origin. [ruby-core:33338]
+
Wed Nov 24 15:44:11 2010 NAKAMURA Usaku <[email protected]>
* ext/socket/extconf.rb (getaddrinfo): should initialize winsock on
diff --git a/re.c b/re.c
index eddb826acc..55dbc949ff 100644
--- a/re.c
+++ b/re.c
@@ -1509,6 +1509,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;
}