diff --git a/srcpkgs/zlib/patches/CVE-2022-37434.patch b/srcpkgs/zlib/patches/1-CVE-2022-37434.patch similarity index 100% rename from srcpkgs/zlib/patches/CVE-2022-37434.patch rename to srcpkgs/zlib/patches/1-CVE-2022-37434.patch diff --git a/srcpkgs/zlib/patches/2-CVE-2022-37434.patch b/srcpkgs/zlib/patches/2-CVE-2022-37434.patch new file mode 100644 index 00000000000..c5c95a92b28 --- /dev/null +++ b/srcpkgs/zlib/patches/2-CVE-2022-37434.patch @@ -0,0 +1,29 @@ +From 1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d Mon Sep 17 00:00:00 2001 +From: Mark Adler +Date: Mon, 8 Aug 2022 10:50:09 -0700 +Subject: [PATCH] Fix extra field processing bug that dereferences NULL + state->head. + +The recent commit to fix a gzip header extra field processing bug +introduced the new bug fixed here. +--- + inflate.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/inflate.c b/inflate.c +index 7a7289749..2a3c4fe98 100644 +--- a/inflate.c ++++ b/inflate.c +@@ -763,10 +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_max) { ++ (len = state->head->extra_len - state->length) < ++ state->head->extra_max) { + zmemcpy(state->head->extra + len, next, + len + copy > state->head->extra_max ? + state->head->extra_max - len : copy); diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template index b0ef4c68e35..17cf7ccaf9f 100644 --- a/srcpkgs/zlib/template +++ b/srcpkgs/zlib/template @@ -1,7 +1,7 @@ # Template file for 'zlib' pkgname=zlib version=1.2.12 -revision=3 +revision=4 bootstrap=yes build_style=configure configure_args="--prefix=/usr --shared"