ruby-changes:19624
From: shyouhei <ko1@a...>
Date: Sat, 21 May 2011 07:49:33 +0900 (JST)
Subject: [ruby-changes:19624] shyouhei:r31667 (ruby_1_8): merge revision(s) 28080:
shyouhei 2011-05-21 07:48:12 +0900 (Sat, 21 May 2011) New Revision: 31667 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31667 Log: 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...> Modified files: branches/ruby_1_8/ChangeLog branches/ruby_1_8/ext/zlib/zlib.c Index: ruby_1_8/ext/zlib/zlib.c =================================================================== --- ruby_1_8/ext/zlib/zlib.c (revision 31666) +++ ruby_1_8/ext/zlib/zlib.c (revision 31667) @@ -610,7 +610,8 @@ } #define zstream_append_input2(z,v)\ - zstream_append_input((z), (Bytef*)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/ChangeLog =================================================================== --- ruby_1_8/ChangeLog (revision 31666) +++ ruby_1_8/ChangeLog (revision 31667) @@ -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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/