yugui	2010-12-20 22:23:06 +0900 (Mon, 20 Dec 2010)

  New Revision: 30266

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30266

  Log:
    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]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/re.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30265)
+++ ruby_1_9_2/ChangeLog	(revision 30266)
@@ -1,3 +1,8 @@
+Fri Nov 26 09:48:45 2010  NAKAMURA Usaku  <usa@r...>
+
+	* re.c (rb_reg_initialize_str): should succeed the taint status from
+	  the origin. [ruby-core:33338]
+
 Tue Nov 23 18:54:03 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* vm.c (rb_thread_mark): should mark self in conrol
Index: ruby_1_9_2/re.c
===================================================================
--- ruby_1_9_2/re.c	(revision 30265)
+++ ruby_1_9_2/re.c	(revision 30266)
@@ -2446,6 +2446,7 @@
     }
     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;
 }
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30265)
+++ ruby_1_9_2/version.h	(revision 30266)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 106
+#define RUBY_PATCHLEVEL 107
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/