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 a0e7b42958..5aba439095 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov 26 09:48:45 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * re.c (rb_reg_initialize_str): should succeed the taint status from
+ the origin. [ruby-core:33338]
+
Fri Nov 26 09:32:37 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* vm_dump.c (dump_thread): seems to be necessary the 3rd argument of
diff --git a/re.c b/re.c
index 82507cfeff..41463eb199 100644
--- a/re.c
+++ b/re.c
@@ -2443,6 +2443,7 @@ rb_reg_initialize_str(VALUE obj, VALUE str, int options, onig_errmsg_buffer err,
}
ret = rb_reg_initialize(obj, RSTRING_PTR(str), RSTRING_LEN(str), enc,
options, err, sourcefile, sourceline);
+ OBJ_INFECT(obj, str);
RB_GC_GUARD(str);
return ret;
}