Commit 93f61c5a by Edward Thomson

pack: continue zlib while we can make progress

Continue the zlib stream as long as we can make progress; stop when we
stop getting output _or_ when zlib stops taking input from us.
parent 03ea04bf
......@@ -908,7 +908,7 @@ static int packfile_unpack_compressed(
do {
size_t bytes = buffer_len - total;
unsigned int window_len;
unsigned int window_len, consumed;
unsigned char *in;
if ((in = pack_window_open(p, mwindow, *position, &window_len)) == NULL) {
......@@ -924,10 +924,15 @@ static int packfile_unpack_compressed(
git_mwindow_close(mwindow);
if (!bytes)
break;
consumed = window_len - (unsigned int)zstream.in_len;
if (!bytes && !consumed) {
git_error_set(GIT_ERROR_ZLIB, "error inflating zlib stream");
error = -1;
goto out;
}
*position += window_len - zstream.in_len;
*position += consumed;
total += bytes;
} while (!git_zstream_eos(&zstream));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment