Merge pull request #2670 from benoit-pierre/pr/fix_zip_writing_with_zstd_compression_...

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 79bbf0335e370f9b1a5366ba0030264a0d3bb532..19121b5191481fa24119a1b5a58bc08e6cca7f6a 100644 (file)
--- 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;