From ac0a41e929a6558fbaffa94646ec64673eaa920a Mon Sep 17 00:00:00 2001 From: yugui Date: Mon, 20 Dec 2010 13:23:06 +0000 Subject: 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 --- ChangeLog | 5 +++++ re.c | 1 + version.h | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5ac65dc128..f28b40ff0a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Nov 26 09:48:45 2010 NAKAMURA Usaku + + * 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 * vm.c (rb_thread_mark): should mark self in conrol 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; } diff --git a/version.h b/version.h index b954955a9e..0674908469 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit v1.2.3