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 /external/zlib/eff308af425b67093bab25f80f1ae950166bece1.patch | |
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)
Diffstat (limited to 'external/zlib/eff308af425b67093bab25f80f1ae950166bece1.patch')
-rw-r--r-- | external/zlib/eff308af425b67093bab25f80f1ae950166bece1.patch | 32 |
1 files changed, 0 insertions, 32 deletions
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); |