Skip to content

Commit 9bb61ba

Browse files
committed
zstream: handle Z_BUF_ERROR appropriately in get_output_chunk
Our processing loop in git_zstream_get_output_chunk does not handle `Z_BUF_ERROR` appropriately at the end of a compressed window. From the zlib manual, inflate will return: > Z_BUF_ERROR if no progress was possible or if there was not enough > room in the output buffer when Z_FINISH is used. Note that Z_BUF_ERROR > is not fatal, and inflate() can be called again with more input and > more output space to continue decompressing. In our loop, we were waiting until we got the expected size, then ensuring that we were at `Z_STREAM_END`. We are not guaranteed to be, since zlib may be in the `Z_BUF_ERROR` state where it has consumed a full window's worth of data, but it doesn't know that it's really at the end of the stream. There _could_ be more compressed data, but it doesn't _know_ that there's not until we make a subsequent call. We can change the loop to look for the end of stream instead of our expected size. This allows us to call inflate one last time when we are at the end of a window (and in the `Z_BUF_ERROR` state), allowing it to recognize the end of the stream, and move from the `Z_BUF_ERROR` state to the `Z_STREAM_END` state. If we do this, we need another exit condition: when `bytes == 0`, then no progress could be made and we should stop trying to inflate. This will be an error case, caught by the size and/or end-of-stream test.
1 parent c71321a commit 9bb61ba

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/pack.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -854,9 +854,12 @@ static int packfile_unpack_compressed(
854854

855855
git_mwindow_close(mwindow);
856856

857+
if (!bytes)
858+
break;
859+
857860
*position += window_len - zstream.in_len;
858861
total += bytes;
859-
} while (total < size);
862+
} while (!git_zstream_eos(&zstream));
860863

861864
if (total != size || !git_zstream_eos(&zstream)) {
862865
git_error_set(GIT_ERROR_ZLIB, "error inflating zlib stream");

0 commit comments

Comments
 (0)