diff options
author | Taichi Haradaguchi <20001722@ymail.ne.jp> | 2022-10-24 18:00:18 +0900 |
---|---|---|
committer | Michael Stahl <michael.stahl@allotropia.de> | 2022-10-26 11:35:16 +0200 |
commit | dc208bbf93ff33f5a625f91272ee6a91dd06b9d7 (patch) | |
tree | 10385c8b9c2f0118d2401ed1b1215756cb8e5ba2 | |
parent | Bump version to 6.1.7.39 (diff) | |
download | core-dc208bbf93ff33f5a625f91272ee6a91dd06b9d7.tar.gz core-dc208bbf93ff33f5a625f91272ee6a91dd06b9d7.zip |
zlib: upgrade to release 1.2.13
Fixes CVE-2022-37434
Removed two patches as fixed upstream.
Change-Id: I10465b7eafc4952cf8dc64e6d7a77f5e5255a386
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141757
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit b2d6ad64473527f88dfb7088376ccf1242d97666)
-rw-r--r-- | download.lst | 4 | ||||
-rw-r--r-- | external/zlib/1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d.patch | 29 | ||||
-rw-r--r-- | external/zlib/UnpackedTarball_zlib.mk | 7 | ||||
-rw-r--r-- | external/zlib/eff308af425b67093bab25f80f1ae950166bece1.patch | 32 |
4 files changed, 3 insertions, 69 deletions
diff --git a/download.lst b/download.lst index 5102499e0795..9d2d6897da8b 100644 --- a/download.lst +++ b/download.lst @@ -247,8 +247,8 @@ export WPS_VERSION_MICRO := 9 export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.xz export XSLTML_SHA256SUM := 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip -export ZLIB_SHA256SUM := 7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18 -export ZLIB_TARBALL := zlib-1.2.12.tar.xz +export ZLIB_SHA256SUM := d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98 +export ZLIB_TARBALL := zlib-1.2.13.tar.xz export ZMF_SHA256SUM := 27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22 export ZMF_TARBALL := libzmf-0.0.2.tar.xz diff --git a/external/zlib/1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d.patch b/external/zlib/1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d.patch deleted file mode 100644 index c5c95a92b28a..000000000000 --- a/external/zlib/1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d Mon Sep 17 00:00:00 2001 -From: Mark Adler <fork@madler.net> -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/external/zlib/UnpackedTarball_zlib.mk b/external/zlib/UnpackedTarball_zlib.mk index 10ee74b9568a..dd9fc1c31445 100644 --- a/external/zlib/UnpackedTarball_zlib.mk +++ b/external/zlib/UnpackedTarball_zlib.mk @@ -16,11 +16,6 @@ $(eval $(call gb_UnpackedTarball_set_post_action,zlib,\ cp $(addsuffix .c,adler32 compress crc32 deflate inffast inflate inftrees trees zutil) x64 \ )) -$(eval $(call gb_UnpackedTarball_set_patchlevel,zlib,1)) - -$(eval $(call gb_UnpackedTarball_add_patches,zlib,\ - external/zlib/eff308af425b67093bab25f80f1ae950166bece1.patch \ - external/zlib/1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d.patch \ -)) +$(eval $(call gb_UnpackedTarball_set_patchlevel,zlib,0)) # vim: set noet sw=4 ts=4: diff --git a/external/zlib/eff308af425b67093bab25f80f1ae950166bece1.patch b/external/zlib/eff308af425b67093bab25f80f1ae950166bece1.patch deleted file mode 100644 index dc84d3a1d385..000000000000 --- a/external/zlib/eff308af425b67093bab25f80f1ae950166bece1.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); |