commit e0bd0ad6e4d8afd2bc3d55d84d459a0e2c0e2890
author Mark Adler <madler@alumni.caltech.edu> Sat Jul 29 23:34:26 2023 -0700
committer Mark Adler <madler@alumni.caltech.edu> Sat Jul 29 23:34:26 2023 -0700
tree 62c25faec9ede38a75b2a1d26d612dbeca92da9a
parent 7b28ecc89d7c29f3e72f0b5dc6303d6f65a35979

Fix reading disk number start on zip64 files in minizip.

contrib/minizip/unzip.c

diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c
index 3adc692..8d010c5 100644
--- a/contrib/minizip/unzip.c
+++ b/contrib/minizip/unzip.c
@@ -988,8 +988,6 @@
             /* 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 @@
                         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;
                 }