diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-20 13:23:06 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-20 13:23:06 +0000 |
commit | ac0a41e929a6558fbaffa94646ec64673eaa920a (patch) | |
tree | 545e0eb7a0da170120b4435388810ae0c3dfb212 | |
parent | c870705df4b76913c4e335ca5e4a92e5f833f940 (diff) |
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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | re.c | 1 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 1 deletions
@@ -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] + Tue Nov 23 18:54:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * vm.c (rb_thread_mark): should mark self in conrol @@ -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; } @@ -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 |