Skip to content

[codex] Avoid retaining caller input after non-blocking gzwrite stall #1302

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

Closed
maxvanamersfort wants to merge 1 commit into from
Closed

[codex] Avoid retaining caller input after non-blocking gzwrite stall #1302

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
23 changes: 20 additions & 3 deletions gzwrite.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ local int gz_zero(gz_statep state) {

/* Write len bytes from buf to file. Return the number of bytes written. If
the returned value is less than len, then there was an error. If the error
was a non-blocking stall, then the number of bytes consumed is returned.
was a non-blocking stall, then the number of bytes accepted is returned.
For any other error, 0 is returned. */
local z_size_t gz_write(gz_statep state, voidpc buf, z_size_t len) {
z_size_t put = len;
Expand Down Expand Up @@ -242,8 +242,25 @@ local z_size_t gz_write(gz_statep state, voidpc buf, z_size_t len) {
n -= state->strm.avail_in;
state->x.pos += n;
len -= n;
if (ret == -1)
return state->again ? put - len : 0;
if (ret == -1) {
if (state->again) {
/* Save an accepted prefix of the remaining input. Never
leave next_in pointing into the caller's buffer after
returning. */
unsigned save = state->strm.avail_in;

if (save > state->size)
save = state->size;
if (save)
memcpy(state->in, state->strm.next_in, save);
state->strm.next_in = state->in;
state->strm.avail_in = save;
state->x.pos += save;
len -= save;
return put - len;
}
return 0;
}
} while (len);
}

Expand Down