Skip to content

Fix Zlib::Inflate#sync with input over UINT_MAX bytes #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hsbt merged 1 commit into from
Oct 26, 2026
+23 −9
Merged

Fix Zlib::Inflate#sync with input over UINT_MAX bytes #169

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 23 additions & 9 deletions ext/zlib/zlib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1259,19 +1259,35 @@ zstream_run(struct zstream *z, Bytef *src, rb_len_t len, int flush)
rb_jump_tag(args.jump_state);
}

static int
zstream_inflate_sync(struct zstream *z, Bytef *src, rb_len_t len)
{
int err;

z->stream.next_in = src;
do {
z->stream.avail_in = MAX_UINT(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;
}

static VALUE
zstream_sync(struct zstream *z, Bytef *src, rb_len_t len)
{
/* VALUE rest; */
int err;

if (!NIL_P(z->input)) {
z->stream.next_in = (Bytef*)RSTRING_PTR(z->input);
z->stream.avail_in = MAX_UINT(RSTRING_LEN(z->input));
err = inflateSync(&z->stream);
err = zstream_inflate_sync(z, (Bytef*)RSTRING_PTR(z->input),
RSTRING_LEN(z->input));
if (err == Z_OK) {
zstream_discard_input(z,
RSTRING_LEN(z->input) - z->stream.avail_in);
zstream_discard_input(z, z->stream.next_in -
(Bytef*)RSTRING_PTR(z->input));
zstream_append_input(z, src, len);
return Qtrue;
}
Expand All @@ -1284,11 +1300,9 @@ zstream_sync(struct zstream *z, Bytef *src, rb_len_t len)

if (len <= 0) return Qfalse;

z->stream.next_in = src;
z->stream.avail_in = MAX_UINT(len);
err = inflateSync(&z->stream);
err = zstream_inflate_sync(z, src, len);
if (err == Z_OK) {
zstream_append_input(z, z->stream.next_in, z->stream.avail_in);
zstream_append_input(z, z->stream.next_in, src + len - z->stream.next_in);
return Qtrue;
}
if (err != Z_DATA_ERROR) {
Expand Down
Loading