kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merges r29932 from trunk into ruby_1_9_2.

Browse source 
--
* 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
This commit is contained in:
yugui 2010-12-20 13:23:06 +00:00
parent c870705df4
commit ac0a41e929
3 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> Tue Nov 23 18:54:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm.c (rb_thread_mark): should mark self in conrol * vm.c (rb_thread_mark): should mark self in conrol

1
re.c
View file

@ -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, ret = rb_reg_initialize(obj, RSTRING_PTR(str), RSTRING_LEN(str), enc,
options, err, sourcefile, sourceline); options, err, sourcefile, sourceline);
OBJ_INFECT(obj, str);
RB_GC_GUARD(str); RB_GC_GUARD(str);
return ret; return ret;
} }

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 106 #define RUBY_PATCHLEVEL 107
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1