archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 29933:

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

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29933 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@30080 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2010-12-04 06:34:08 +00:00
parent de7048ce90
commit 1a70fe6908
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Dec 4 11:25:02 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* re.c (rb_reg_regcomp): should succeed the taint status from the
origin. [ruby-core:33338]
Thu Dec 2 21:13:42 2010 URABE Shyouhei <shyouhei@ruby-lang.org> Thu Dec 2 21:13:42 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
* Makefile.in (fake.rb): need to expand the topdir in case of it * Makefile.in (fake.rb): need to expand the topdir in case of it

1
re.c
View file

@ -1506,6 +1506,7 @@ rb_reg_regcomp(str)
case_cache = ruby_ignorecase; case_cache = ruby_ignorecase;
kcode_cache = reg_kcode; kcode_cache = reg_kcode;
reg_cache = rb_reg_new(RSTRING(str)->ptr, RSTRING(str)->len, ruby_ignorecase); reg_cache = rb_reg_new(RSTRING(str)->ptr, RSTRING(str)->len, ruby_ignorecase);
OBJ_INFECT(reg_cache, str);
RB_GC_GUARD(save_str); RB_GC_GUARD(save_str);
return reg_cache; return reg_cache;
} }

8
version.h
View file

@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.7" #define RUBY_VERSION "1.8.7"
#define RUBY_RELEASE_DATE "2010-12-02" #define RUBY_RELEASE_DATE "2010-12-04"
#define RUBY_VERSION_CODE 187 #define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20101202 #define RUBY_RELEASE_CODE 20101204
#define RUBY_PATCHLEVEL 327 #define RUBY_PATCHLEVEL 328
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 7 #define RUBY_VERSION_TEENY 7
#define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_YEAR 2010
#define RUBY_RELEASE_MONTH 12 #define RUBY_RELEASE_MONTH 12
#define RUBY_RELEASE_DAY 2 #define RUBY_RELEASE_DAY 4
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];