Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 27 additions & 9 deletions ext/zlib/zlib.c
Original file line number Diff line number Diff line change
Expand Up @@ -959,6 +959,13 @@ zstream_reset_input(struct zstream *z)
}
}

static void
zstream_clear_next_in(struct zstream *z)
{
z->stream.next_in = Z_NULL;
z->stream.avail_in = 0;
}

static void
zstream_passthrough_input(struct zstream *z)
{
Expand Down Expand Up @@ -1146,6 +1153,12 @@ zstream_run_func(struct zstream_run_args *args)
return err;
}

static VALUE
zstream_run_func_protect(VALUE args)
{
return (VALUE)zstream_run_func((struct zstream_run_args *)args);
}

static VALUE
zstream_run_try(VALUE value_arg)
{
Expand All @@ -1155,7 +1168,7 @@ zstream_run_try(VALUE value_arg)
rb_len_t len = args->len;
int flush = args->flush;

int err;
int err, state;
VALUE old_input = Qnil;

/* Cannot start zstream while it is in progress. */
Expand Down Expand Up @@ -1191,7 +1204,13 @@ zstream_run_try(VALUE value_arg)
}

loop:
err = zstream_run_func(args);
err = (int)rb_protect(zstream_run_func_protect, (VALUE)args, &state);
if (state) {
zstream_reset_input(z);
zstream_append_input(z, z->stream.next_in, z->stream.avail_in + args->rest_in);
zstream_clear_next_in(z);
rb_jump_tag(state);
}

/* retry if no exception is thrown */
if (err == Z_OK && args->interrupt) {
Expand Down Expand Up @@ -1231,18 +1250,15 @@ zstream_run_try(VALUE value_arg)
}
}
}
z->stream.next_in = Z_NULL;
z->stream.avail_in = 0;
zstream_clear_next_in(z);
raise_zlib_error(err, z->stream.msg);
}

zstream_append_input(z, z->stream.next_in, z->stream.avail_in + args->rest_in);
if (!NIL_P(old_input)) {
rb_str_resize(old_input, 0);
}
/* the rest is in z->input now; do not leave next_in in old_input */
z->stream.next_in = Z_NULL;
z->stream.avail_in = 0;
zstream_clear_next_in(z);

return Qnil;
}
Expand Down Expand Up @@ -1289,8 +1305,6 @@ zstream_inflate_sync(struct zstream *z, Bytef *src, rb_len_t len)
len -= z->stream.avail_in;
err = inflateSync(&z->stream);
} while (err == Z_DATA_ERROR && len > 0);
/* do_inflate() looks at avail_in for the input left after the sync point */
z->stream.avail_in = MAX_UINT(z->stream.avail_in + len);

return err;
}
Expand All @@ -1311,9 +1325,11 @@ zstream_sync(struct zstream *z, Bytef *src, rb_len_t len)
if (err == Z_OK) {
zstream_discard_input(z, z->stream.next_in -
(Bytef*)RSTRING_PTR(z->input));
zstream_clear_next_in(z);
zstream_append_input(z, src, len);
return Qtrue;
}
zstream_clear_next_in(z);
zstream_reset_input(z);
if (err != Z_DATA_ERROR) {
/* rest = rb_str_new((char*)z->stream.next_in, z->stream.avail_in); */
Expand All @@ -1326,8 +1342,10 @@ zstream_sync(struct zstream *z, Bytef *src, rb_len_t len)
err = zstream_inflate_sync(z, src, len);
if (err == Z_OK) {
zstream_append_input(z, z->stream.next_in, src + len - z->stream.next_in);
zstream_clear_next_in(z);
return Qtrue;
}
zstream_clear_next_in(z);
if (err != Z_DATA_ERROR) {
/* rest = rb_str_new((char*)z->stream.next_in, z->stream.avail_in); */
raise_zlib_error(err, z->stream.msg);
Expand Down
21 changes: 21 additions & 0 deletions test/zlib/test_zlib.rb
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,27 @@ def test_closed_p
assert_equal(true, z.closed?)
end

def test_params_after_interrupted_deflate
assert_separately(%w[-rzlib], "#{<<~"begin;"}\n#{<<~'end;'}", timeout: 60)
begin;
data = Random.new(0).bytes(8 << 20)
z = nil
[0.001, 0.005, 0.01, 0.02, 0.05, 0.1].cycle(3) do |wait|
z = Zlib::Deflate.new(1)
th = Thread.new { z.deflate(data) rescue nil }
sleep wait
th.raise(RuntimeError)
th.join
break if z.total_in > 0 && z.total_in < data.bytesize
z = nil
end
omit "deflate was not interrupted in the middle" unless z
GC.start
EnvUtil.suppress_warning { z.params(9, Zlib::HUFFMAN_ONLY) }
assert_kind_of(String, z.finish)
end;
end

def test_params_with_buf_error_and_pending_output
data = Random.new(0).bytes(1000)
z = Zlib::Deflate.new(Zlib::DEFAULT_COMPRESSION, Zlib::MAX_WBITS, 1)
Expand Down
Loading