shyouhei	2011-05-23 13:49:42 +0900 (Mon, 23 May 2011)

  New Revision: 31714

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31714

  Log:
    merge revision(s) 31667:
    
    merge revision(s) 28080:
    
    * 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@r...>
    
    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@r...>

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/ext/zlib/zlib.c
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ext/zlib/zlib.c
===================================================================
--- ruby_1_8_7/ext/zlib/zlib.c	(revision 31713)
+++ ruby_1_8_7/ext/zlib/zlib.c	(revision 31714)
@@ -610,7 +610,8 @@
 }
 
 #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)
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 31713)
+++ ruby_1_8_7/ChangeLog	(revision 31714)
@@ -1,3 +1,8 @@
+Sat May 21 07:33:54 2011  Yusuke Endoh  <mame@t...>
+
+	* 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@r...>
 
 	* eval.c (rb_thread_atfork): When a ruby process forks, its random
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 31713)
+++ ruby_1_8_7/version.h	(revision 31714)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/