merges r29932 from trunk into ruby_1_9_2.

--
* re.c (rb_reg_initialize_str): should succeed the taint status from
  the origin. [ruby-core:33338]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30266 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 0 deletions

diff --git a/re.c b/re.c
index 298d1d9554..8e2dcbd7cd 100644
--- a/re.c
+++ b/re.c
@@ -2446,6 +2446,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;
 }