Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

merge revision(s) 31667:

?\012
merge revision(s) 28080:
?\012
	* ext/zlib/zlib.c (zstream_append_input2): add RB_GC_GUARD.
	  This caused failure when test/csv is executed with GC.stress = true.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28080 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@31667 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@31714 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
commit 63f7d6ef9dfd8f8eef61d4b0fdeb70639a157a8c 1 parent 17bff4c
@shyouhei shyouhei authored
Showing with 8 additions and 2 deletions.
  1. +5 −0 ChangeLog
  2. +2 −1  ext/zlib/zlib.c
  3. +1 −1  version.h
View
5 ChangeLog
@@ -1,3 +1,8 @@
+Sat May 21 07:33:54 2011 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * ext/zlib/zlib.c (zstream_append_input2): add RB_GC_GUARD.
+ This caused failure when test/csv is executed with GC.stress = true.
+
Sat May 21 05:43:03 2011 URABE Shyouhei <shyouhei@ruby-lang.org>
* eval.c (rb_thread_atfork): When a ruby process forks, its random
View
3  ext/zlib/zlib.c
@@ -610,7 +610,8 @@ zstream_append_input(z, src, len)
}
#define zstream_append_input2(z,v)\
- zstream_append_input((z), RSTRING(v)->ptr, RSTRING(v)->len)
+ RB_GC_GUARD(v),\
+ zstream_append_input((z), (Bytef*)RSTRING_PTR(v), RSTRING_LEN(v))
static void
zstream_discard_input(z, len)
View
2  version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2011-05-23"
#define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20110523
-#define RUBY_PATCHLEVEL 345
+#define RUBY_PATCHLEVEL 346
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
Please sign in to comment.
Something went wrong with that request. Please try again.