diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-28 14:35:40 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-28 14:35:40 +0000 |
| commit | 889c7ff0eb295ab20766ec9580d652be13b42357 (patch) | |
| tree | b466c1fb9209e2fd44054285d09a53d7f39b9fcf | |
| parent | eb93987cd4c7a483839054e6a19b46f44d9b839b (diff) | |
merges r21859 from trunk into ruby_1_9_1.
* ext/zlib/zlib.c (zstream_run): desperately guard the variable.
[ruby-core:20576]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21860 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/zlib/zlib.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -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) { |