1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* ext/zlib/zlib.c (zstream_run): fixed SEGV. [ruby-core:4712]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8345 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ocean 2005-04-18 02:34:20 +00:00
parent 3403d175d9
commit 4605d6bc41
2 changed files with 9 additions and 0 deletions

View file

@ -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.

View file

@ -709,6 +709,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 = "";
@ -718,6 +719,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) {