From bd0ba009d1b28efe8c3a772540ad64635bb02edd Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 29 Jan 2009 17:12:16 +0000 Subject: merges r21861 from trunk into ruby_1_9_1. * ext/zlib/zlib.c (zstream_run): previous change didn't resolve the problem. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21878 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/zlib/zlib.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2ffc52f999..9507c98aef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Jan 29 00:24:48 2009 NAKAMURA Usaku + + * ext/zlib/zlib.c (zstream_run): previous change didn't resolve the + problem. + Fri Jan 30 01:39:27 2009 Yusuke Endoh * parse.y (top_compstmt, top_stmts, top_stmt): prohibit BEGIN {} in 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; -- cgit v1.2.3