From 0cbf47a88f1a80801d96193cd430b0e9cceb2a59 Mon Sep 17 00:00:00 2001
From: ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 18 Apr 2005 02:34:20 +0000
Subject: [PATCH] * ext/zlib/zlib.c (zstream_run): fixed SEGV. [ruby-core:4712]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8345 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog       | 4 ++++
 ext/zlib/zlib.c | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index d7f9fba1d7..2445f1359f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Apr 18 11:25:14 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/zlib/zlib.c (zstream_run): fixed SEGV. [ruby-core:4712]
+
 Sun Apr 17 23:57:49 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/extmk.rb (extmake, parse_args): do not expand destdir.
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 98f60cbcbb..c8c4407d08 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -706,6 +706,7 @@ zstream_run(z, src, len, flush)
 {
     uInt n;
     int err;
+    volatile VALUE guard;
 
     if (NIL_P(z->input) && len == 0) {
 	z->stream.next_in = "";
@@ -715,6 +716,10 @@ zstream_run(z, src, len, flush)
 	zstream_append_input(z, src, len);
 	z->stream.next_in = RSTRING(z->input)->ptr;
 	z->stream.avail_in = RSTRING(z->input)->len;
+	/* 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;
     }
 
     if (z->stream.avail_out == 0) {