From e0bd0ad6e4d8afd2bc3d55d84d459a0e2c0e2890 Mon Sep 17 00:00:00 2001 From: Mark Adler Date: Sat, 29 Jul 2023 23:34:26 -0700 Subject: [PATCH] Fix reading disk number start on zip64 files in minizip. --- contrib/minizip/unzip.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c index 3adc692f3..8d010c5a1 100644 --- a/contrib/minizip/unzip.c +++ b/contrib/minizip/unzip.c @@ -988,8 +988,6 @@ local int unz64local_GetCurrentFileInfoInternal(unzFile file, /* ZIP64 extra fields */ if (headerId == 0x0001) { - uLong uL; - if(file_info.uncompressed_size == MAXU32) { if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK) @@ -1009,10 +1007,10 @@ local int unz64local_GetCurrentFileInfoInternal(unzFile file, err=UNZ_ERRNO; } - if(file_info.disk_num_start == MAXU32) + if(file_info.disk_num_start == 0xffff) { /* Disk Start Number */ - if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK) + if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK) err=UNZ_ERRNO; }