diff options
| author | CoprDistGit <infra@openeuler.org> | 2026-11-07 06:22:11 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2026-11-07 06:22:11 +0000 |
| commit | d259e194df12569c8fe286eacd285be28118ecd7 (patch) | |
| tree | 838258e9a13837f135e94257e7d17db9c9218608 /backport-Fix-reading-disk-number-start-on-zip64-files-in-minizip.patch | |
| parent | b1143670a63c1a72a4bd0e0e4337fc5fa3be85b4 (diff) | |
automatic import of zlibopeneuler24.03_LTS_SP3
Diffstat (limited to 'backport-Fix-reading-disk-number-start-on-zip64-files-in-minizip.patch')
| -rw-r--r-- | backport-Fix-reading-disk-number-start-on-zip64-files-in-minizip.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/backport-Fix-reading-disk-number-start-on-zip64-files-in-minizip.patch b/backport-Fix-reading-disk-number-start-on-zip64-files-in-minizip.patch new file mode 100644 index 0000000..f68c8af --- /dev/null +++ b/backport-Fix-reading-disk-number-start-on-zip64-files-in-minizip.patch @@ -0,0 +1,40 @@ +From e0bd0ad6e4d8afd2bc3d55d84d459a0e2c0e2890 Mon Sep 17 00:00:00 2001 +From: Mark Adler <madler@alumni.caltech.edu> +Date: Sat, 29 Jul 2023 23:34:26 -0700 +Subject: [PATCH] Fix reading disk number start on zip64 files in minizip. + +Reference:https://github.com/madler/zlib/commit/e0bd0ad6e4d8afd2bc3d55d84d459a0e2c0e2890 +Conflict:NA +--- + 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 1da51a9..9329732 100644 +--- a/contrib/minizip/unzip.c ++++ b/contrib/minizip/unzip.c +@@ -1038,8 +1038,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) +@@ -1059,10 +1057,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; + } + +-- +2.27.0 + |