From 54cecd590bcd4520bed8af4bd19befd087088cb0 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 26 Jan 2023 23:38:55 +0100 Subject: [PATCH] Update bundled zlib to 1.2.13.1 This fixes CVE-2022-37434 (which shouldn't normally affect the use of zlib in wxWidgets but it still seems better to not have it than to have). See #22919. (cherry picked from commit b4f1ae68b5961e0a309b10f9114be6a55a7f1a21) --- docs/changes.txt | 1 + src/zlib | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/changes.txt b/docs/changes.txt index 4aefb01833..3e159bc4e1 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -244,6 +244,7 @@ All: - Fix memory leak when destroying wxThread (Antti Nietosvaara, #22840). - Add serial number to wxwin.m4 file (#22848). - Update Expat submodule to include the fix for CVE-2022-40674. +- Update zlib to 1.2.13.1 to include the fix for CVE-2022-37434 (#22919). - Allow 'T' separator in wxDateTime::ParseDateTime() (Blake-Madden, #22999). - Add Serbian translations (Nikola Jović). - Fix MT-safety problem in wxZipInputStream (#23054). diff --git a/src/zlib b/src/zlib index b4c511e9ee..a6c8900ecb 160000 --- a/src/zlib +++ b/src/zlib @@ -1 +1 @@ -Subproject commit b4c511e9ee69d5a3090fc89d8b02b19b789e3416 +Subproject commit a6c8900ecb9da7ac0d2a67467258fd4c1814b780