c/minizip-ng
1
0
Fork 0
mirror of https://github.com/zlib-ng/minizip-ng synced 2025-03-28 21:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed split disk archives being created with 0 bytes. #669

Browse Source 
After the first disk, disks would be created with zero size. This would happen
when using MZ_ZIP_FLAG_DATA_DESCRIPTOR or MZ_ZIP_FLAG_MASK_LOCAL_INFO, because
we were changing the disk properly when going to update local file info headers.
This commit is contained in:
Nathan Moinvaziri 2023-02-12 15:57:00 -08:00
parent 804e057b73
commit 23f66e974d
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mz_strm_split.c
View File

@ -285,6 +285,8 @@ int32_t mz_stream_split_write(void *stream, const void *buf, int32_t size) {
err = mz_stream_split_goto_disk(stream, number_disk);
if (err != MZ_OK)
return err;
position = 0;
}
if (split->number_disk != -1) {
@ -306,10 +308,9 @@ int32_t mz_stream_split_write(void *stream, const void *buf, int32_t size) {
split->total_out += written;
split->total_out_disk += written;
if (position == split->current_disk_size) {
split->current_disk_size += written;
position = split->current_disk_size;
}
position += written;
if (position > split->current_disk_size)
split->current_disk_size = position;
}
return size - bytes_left;

4
mz_zip.c
View File

@ -2184,7 +2184,9 @@ int32_t mz_zip_entry_write_close(void *handle, uint32_t crc32, int64_t compresse
if (err == MZ_OK) {
/* Seek to crc32 and sizes offset in local header */
err = mz_stream_seek(zip->stream, MZ_ZIP_OFFSET_CRC_SIZES, MZ_SEEK_CUR);
err = mz_stream_set_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_NUMBER, zip->file_info.disk_number);
if (err == MZ_OK)
err = mz_stream_seek(zip->stream, zip->file_info.disk_offset + MZ_ZIP_OFFSET_CRC_SIZES, MZ_SEEK_SET);
}
if (err == MZ_OK)