Permalink
Browse files

merge revision(s) 29933:

?\012
	* 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@30080 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent 399122d commit 3b86ac2b8d90f0919aa36f23102d92f27e9d6ea8 @shyouhei shyouhei committed Dec 4, 2010
Showing with 10 additions and 4 deletions.
  1. +5 −0 ChangeLog
  2. +1 −0 re.c
  3. +4 −4 version.h
View
@@ -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>
* Makefile.in (fake.rb): need to expand the topdir in case of it
View
1 re.c
@@ -1506,6 +1506,7 @@ rb_reg_regcomp(str)
case_cache = ruby_ignorecase;
kcode_cache = reg_kcode;
reg_cache = rb_reg_new(RSTRING(str)->ptr, RSTRING(str)->len, ruby_ignorecase);
+ OBJ_INFECT(reg_cache, str);
RB_GC_GUARD(save_str);
return reg_cache;
}
View
@@ -1,15 +1,15 @@
#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_RELEASE_CODE 20101202
-#define RUBY_PATCHLEVEL 327
+#define RUBY_RELEASE_CODE 20101204
+#define RUBY_PATCHLEVEL 328
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 7
#define RUBY_RELEASE_YEAR 2010
#define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 2
+#define RUBY_RELEASE_DAY 4
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];

0 comments on commit 3b86ac2

Please sign in to comment.