* ext/zlib/zlib.c (zstream_run): previous change didn't resolve the

	  problem.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21861 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 1 deletions

diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 9c6cf9495e..ffc566197c 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. */
-	RB_GC_GUARD(guard) = z->input;
+	guard = z->input;
     }
 
     if (z->stream.avail_out == 0) {
@@ -716,6 +716,9 @@ zstream_run(struct zstream *z, Bytef *src, uInt len, int flush)
     }
 
     for (;;) {
+	/* VC allocates err and guard to same address.  accessing err and guard
+	   in same scope prevents it. */
+	RB_GC_GUARD(guard);
 	n = z->stream.avail_out;
 	err = z->func->run(&z->stream, flush);
 	z->buf_filled += n - z->stream.avail_out;