mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/zlib/zlib.c (zstream_run): always use zstream_append_input()
to avoid SEGV. [ruby-dev:24568] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7102 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
1419b789ab
commit
3377aebed4
2 changed files with 8 additions and 9 deletions
|
@ -1,3 +1,8 @@
|
|||
Sat Oct 23 00:20:55 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
* ext/zlib/zlib.c (zstream_run): always use zstream_append_input()
|
||||
to avoid SEGV. [ruby-dev:24568]
|
||||
|
||||
Fri Oct 22 12:02:28 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
* eval.c (rb_alias): was warning for wrong condition.
|
||||
|
|
|
@ -699,15 +699,9 @@ zstream_run(z, src, len, flush)
|
|||
uInt n;
|
||||
int err;
|
||||
|
||||
if (NIL_P(z->input)) {
|
||||
z->stream.next_in = src;
|
||||
z->stream.avail_in = len;
|
||||
}
|
||||
else {
|
||||
zstream_append_input(z, src, len);
|
||||
z->stream.next_in = RSTRING(z->input)->ptr;
|
||||
z->stream.avail_in = RSTRING(z->input)->len;
|
||||
}
|
||||
zstream_append_input(z, src, len);
|
||||
z->stream.next_in = RSTRING(z->input)->ptr;
|
||||
z->stream.avail_in = RSTRING(z->input)->len;
|
||||
|
||||
if (z->stream.avail_out == 0) {
|
||||
zstream_expand_buffer(z);
|
||||
|
|
Loading…
Reference in a new issue