diff options
author | Ariadne Conill <ariadne@dereferenced.org> | 2022-04-23 02:58:10 +0000 |
---|---|---|
committer | alice <alice@ayaya.dev> | 2022-05-11 23:35:33 +0000 |
commit | 17507d27f06ee78f9df663e1142108fc3f151805 (patch) | |
tree | 460e91681a5331dab346eb69e61e3b4d20c6b06f /main/zlib/crc32.patch | |
parent | 96b07a1c688f4a711b6681ddafc29649d92f2897 (diff) |
main/zlib: fix crc32 on 64-bit systems
thanks to sam@gentoo.org for pointing this out
upstream patch: https://github.com/madler/zlib/commit/ec3df00224d4b396e2ac6586ab5d25f673caa4c2
upstream bug report: https://github.com/madler/zlib/issues/618
alpine bug report: https://gitlab.alpinelinux.org/alpine/aports/-/issues/13711
fixes "java.util.zip.ZipException: invalid entry CRC" in Java JRE/JDK on 64-bit systems
this backports the fix from master to 3.12-stable
(cherry picked from commit 6754a9005594de4243aad9b2744546971078c6c7)
Diffstat (limited to 'main/zlib/crc32.patch')
-rw-r--r-- | main/zlib/crc32.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/main/zlib/crc32.patch b/main/zlib/crc32.patch new file mode 100644 index 00000000000..85a6a7e3ab4 --- /dev/null +++ b/main/zlib/crc32.patch @@ -0,0 +1,51 @@ +From ec3df00224d4b396e2ac6586ab5d25f673caa4c2 Mon Sep 17 00:00:00 2001 +From: Mark Adler <madler@alumni.caltech.edu> +Date: Wed, 30 Mar 2022 11:14:53 -0700 +Subject: [PATCH] Correct incorrect inputs provided to the CRC functions. + +The previous releases of zlib were not sensitive to incorrect CRC +inputs with bits set above the low 32. This commit restores that +behavior, so that applications with such bugs will continue to +operate as before. +--- + crc32.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/crc32.c b/crc32.c +index a1bdce5c2..451887bc7 100644 +--- a/crc32.c ++++ b/crc32.c +@@ -630,7 +630,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len) + #endif /* DYNAMIC_CRC_TABLE */ + + /* Pre-condition the CRC */ +- crc ^= 0xffffffff; ++ crc = (~crc) & 0xffffffff; + + /* Compute the CRC up to a word boundary. */ + while (len && ((z_size_t)buf & 7) != 0) { +@@ -749,7 +749,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len) + #endif /* DYNAMIC_CRC_TABLE */ + + /* Pre-condition the CRC */ +- crc ^= 0xffffffff; ++ crc = (~crc) & 0xffffffff; + + #ifdef W + +@@ -1077,7 +1077,7 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2) + #ifdef DYNAMIC_CRC_TABLE + once(&made, make_crc_table); + #endif /* DYNAMIC_CRC_TABLE */ +- return multmodp(x2nmodp(len2, 3), crc1) ^ crc2; ++ return multmodp(x2nmodp(len2, 3), crc1) ^ (crc2 & 0xffffffff); + } + + /* ========================================================================= */ +@@ -1112,5 +1112,5 @@ uLong crc32_combine_op(crc1, crc2, op) + uLong crc2; + uLong op; + { +- return multmodp(op, crc1) ^ crc2; ++ return multmodp(op, crc1) ^ (crc2 & 0xffffffff); + } |