Skip to content

Put back the unconsumed input when the stream is interrupted - #186

Open
mame wants to merge 2 commits into
ruby:masterfrom
mame:zlib-interrupted-input
Open

mame wants to merge 2 commits into
ruby:masterfrom
mame:zlib-interrupted-input

Conversation

@mame

@mame mame commented Nov 9, 2026

Copy link
Copy Markdown
Member

An interrupt such as Thread#raise or Timeout raised in the middle of zstream_run left the unconsumed input in the detached string and next_in pointing to it, which Zlib::Deflate#params could read after it was freed. Put the input back and clear next_in before raising again.

mame and others added 2 commits November 9, 2026 16:46
An interrupt such as Thread#raise or Timeout raised in the middle of
zstream_run left the unconsumed input in the detached string and
next_in pointing to it, which Zlib::Deflate#params could read after it
was freed.  Put the input back and clear next_in before raising again.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Zlib::Inflate#sync also left next_in and avail_in pointing to the input
after moving the rest of it to z->input.  Clear them there too with a
helper shared with zstream_run, so that next_in is always empty outside
zstream_run and the pending input lives only in z->input.  The
adjustment of avail_in for do_inflate is no longer needed since it
checks z->input.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant