[PATCH 3/4] archive-zip: in write_zip_entry() call git_deflate() in a loop
- From
Toon Claes <toon@iotcl.com>
- Date
- Aug 4, 2025, 16:56 UTC
- Message-ID
- <20250804-toon-archive-zip-fix-v1-3-ca89858e5eaa@iotcl.com>
- In-Reply-To
- <20250804-toon-archive-zip-fix-v1-0-ca89858e5eaa@iotcl.com>
The function git_deflate() might not complete to deflate all the input data in one go. While the function is already being called in a loop, every loop fresh data is read from the stream. This is not correct, because input data might get lost.
As we see in many other callsites, git_deflate() should be called in a loop on the existing input to make it process all the input data.
Add in a nested loop around git_deflate() to process the input buffer completely, before continuing the parent loop that reads from more data from the input stream.
Co-authored-by: Justin Tobler <jltobler@gmail.com> Signed-off-by: Toon Claes <toon@iotcl.com> --- archive-zip.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/archive-zip.c b/archive-zip.c index d41a12de5f..25a0224130 100644 --- a/archive-zip.c +++ b/archive-zip.c @@ -471,15 +471,17 @@ static int write_zip_entry(struct archiver_args *args, zstream.next_in = buf; zstream.avail_in = readlen; - zstream.next_out = compressed; - zstream.avail_out = sizeof(compressed); - result = git_deflate(&zstream, 0); - if (result != Z_OK) - die(_("deflate error (%d)"), result); - out_len = zstream.next_out - compressed; + do { + zstream.next_out = compressed; + zstream.avail_out = sizeof(compressed); + result = git_deflate(&zstream, 0); + if (result != Z_OK) + die(_("deflate error (%d)"), result); + out_len = zstream.next_out - compressed; - write_or_die(1, compressed, out_len); - compressed_size += out_len; + write_or_die(1, compressed, out_len); + compressed_size += out_len; + } while (zstream.avail_out == 0); } close_istream(stream); if (readlen)
-- 2.50.1.327.g047016eb4a