yugui	2009-01-28 23:35:40 +0900 (Wed, 28 Jan 2009)

  New Revision: 21860

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

  Log:
    merges r21859 from trunk into ruby_1_9_1.
    * ext/zlib/zlib.c (zstream_run): desperately guard the variable.
      [ruby-core:20576]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/ext/zlib/zlib.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21859)
+++ ruby_1_9_1/ChangeLog	(revision 21860)
@@ -1,3 +1,8 @@
+Wed Jan 28 22:51:12 2009  NAKAMURA Usaku  <usa@r...>
+
+	* ext/zlib/zlib.c (zstream_run): desperately guard the variable.
+	  [ruby-core:20576]
+
 Mon Jan 19 11:46:39 2009  Koichi Sasada  <ko1@a...>
 
 	* vm_eval.c, eval.c (rb_f_block_given_p): move definition of
Index: ruby_1_9_1/ext/zlib/zlib.c
===================================================================
--- ruby_1_9_1/ext/zlib/zlib.c	(revision 21859)
+++ ruby_1_9_1/ext/zlib/zlib.c	(revision 21860)
@@ -708,7 +708,7 @@
 	/* keep reference to `z->input' so as not to be garbage collected
 	   after zstream_reset_input() and prevent `z->stream.next_in'
 	   from dangling. */
-	guard = z->input;
+	RB_GC_GUARD(guard) = z->input;
     }
 
     if (z->stream.avail_out == 0) {

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