summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/zlib/zlib.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4349bfb56..38656766f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan 28 22:51:12 2009 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/zlib/zlib.c (zstream_run): desperately guard the variable.
+ [ruby-core:20576]
+
Mon Jan 19 11:46:39 2009 Koichi Sasada <ko1@atdot.net>
* vm_eval.c, eval.c (rb_f_block_given_p): move definition of
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 30c324167..9c6cf9495 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -708,7 +708,7 @@ zstream_run(struct zstream *z, Bytef *src, uInt len, int flush)
/* 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) {