From: Martin Matuška <martin@matuska.de>
Date: Wed, 10 Sep 2025 08:41:33 +0000 (+0200)
Subject: Merge pull request #2670 from benoit-pierre/pr/fix_zip_writing_with_zstd_compression_... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b5e6d4aedaa9ef17099322dcfd98519e33e1f51;p=thirdparty%2Flibarchive.git

Merge pull request #2670 from benoit-pierre/pr/fix_zip_writing_with_zstd_compression_method

zip: fix writing with ZSTD compression
(cherry picked from commit 589659ed7fe15cee514dda3dea81f4053de5a3f3)
---

diff --git a/libarchive/archive_write_set_format_zip.c b/libarchive/archive_write_set_format_zip.c
index 79bbf0335..19121b519 100644
--- a/libarchive/archive_write_set_format_zip.c
+++ b/libarchive/archive_write_set_format_zip.c
@@ -1952,10 +1952,11 @@ archive_write_zip_finish_entry(struct archive_write *a)
 			}
 			zip->entry_compressed_written += remainder;
 			zip->written_bytes += remainder;
-			zip->stream.zstd.out.dst = zip->buf;
 			if (zip->stream.zstd.out.pos != zip->stream.zstd.out.size)
 				finishing = 0;
+			zip->stream.zstd.out.dst = zip->buf;
 			zip->stream.zstd.out.size = zip->len_buf;
+			zip->stream.zstd.out.pos = 0;
 		} while (finishing);
 		ZSTD_freeCStream(zip->stream.zstd.context);
 		break;