aboutsummaryrefslogtreecommitdiffstats
path: root/package/libs/zlib/patches/006-fix-CVE-2022-37434.patch
diff options
context:
space:
mode:
authorNick Hainke <vincent@systemli.org>2022-10-21 14:36:47 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2022-11-13 20:47:57 +0100
commitde79a0a9e0679b03d35c92e3abbce6e9fbb19a9d (patch)
tree5ec843446bbfeb385b3340b231fb5d8c6bf3173f /package/libs/zlib/patches/006-fix-CVE-2022-37434.patch
parentcec9cbef449daea6529fbda64777ff1b7ae4e499 (diff)
downloadupstream-de79a0a9e0679b03d35c92e3abbce6e9fbb19a9d.tar.gz
upstream-de79a0a9e0679b03d35c92e3abbce6e9fbb19a9d.tar.bz2
upstream-de79a0a9e0679b03d35c92e3abbce6e9fbb19a9d.zip
zlib: update to 1.2.13
Remove "001-neon-implementation-of-adler32.patch" because upstreamed deleted assembler code optimizations: https://github.com/madler/zlib/commit/d0704a820186481da35d08f4b655881e1d32089f Remove upstreamed patches: - 006-fix-CVE-2022-37434.patch - 007-fix-null-dereference-in-fix-CVE-2022-37434.patch Refresh patches: - 002-arm-specific-optimisations-for-inflate.patch - 003-arm-specific-optimisations-for-inflate.patch - 004-attach-sourcefiles-in-patch-002-to-buildsystem.patch Switch to "https github.com" for downloading source files. Release Announcements: https://github.com/madler/zlib/releases/tag/v1.2.13 Signed-off-by: Nick Hainke <vincent@systemli.org>
Diffstat (limited to 'package/libs/zlib/patches/006-fix-CVE-2022-37434.patch')
-rw-r--r--package/libs/zlib/patches/006-fix-CVE-2022-37434.patch32
1 files changed, 0 insertions, 32 deletions
diff --git a/package/libs/zlib/patches/006-fix-CVE-2022-37434.patch b/package/libs/zlib/patches/006-fix-CVE-2022-37434.patch
deleted file mode 100644
index dc84d3a1d3..0000000000
--- a/package/libs/zlib/patches/006-fix-CVE-2022-37434.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From eff308af425b67093bab25f80f1ae950166bece1 Mon Sep 17 00:00:00 2001
-From: Mark Adler <fork@madler.net>
-Date: Sat, 30 Jul 2022 15:51:11 -0700
-Subject: [PATCH] Fix a bug when getting a gzip header extra field with
- inflate().
-
-If the extra field was larger than the space the user provided with
-inflateGetHeader(), and if multiple calls of inflate() delivered
-the extra header data, then there could be a buffer overflow of the
-provided space. This commit assures that provided space is not
-exceeded.
----
- inflate.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/inflate.c b/inflate.c
-index 7be8c6366..7a7289749 100644
---- a/inflate.c
-+++ b/inflate.c
-@@ -763,9 +763,10 @@ int flush;
- copy = state->length;
- if (copy > have) copy = have;
- if (copy) {
-+ len = state->head->extra_len - state->length;
- if (state->head != Z_NULL &&
-- state->head->extra != Z_NULL) {
-- len = state->head->extra_len - state->length;
-+ state->head->extra != Z_NULL &&
-+ len < state->head->extra_max) {
- zmemcpy(state->head->extra + len, next,
- len + copy > state->head->extra_max ?
- state->head->extra_max - len : copy);