From 168ff3419f256fdb35b586275d293fc0cd773fe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Klitzing?= Date: Mon, 28 Mar 2022 22:58:26 +0200 Subject: Update bundled zlib to version 1.2.12 The remaining diff to clean 1.2.12 is archived in the qtpatches.diff file. Also this fixes CVE-2018-25032. [ChangeLog][Third-Party Code] zlib was updated to version 1.2.12. Pick-to: 5.15 Change-Id: Ifab5d57acdc90ace61f2fd22c6dbb7ec6b4ad319 Reviewed-by: Edward Welbourne Reviewed-by: Kai Koehne (cherry picked from commit a0a2bf2d95d4fcd468b6ce3c2e728d95425dd760) Reviewed-by: Qt CI Bot --- src/3rdparty/zlib/src/zutil.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/3rdparty/zlib/src/zutil.c') diff --git a/src/3rdparty/zlib/src/zutil.c b/src/3rdparty/zlib/src/zutil.c index a76c6b0c7e..dcab28a0d5 100644 --- a/src/3rdparty/zlib/src/zutil.c +++ b/src/3rdparty/zlib/src/zutil.c @@ -136,8 +136,8 @@ const char * ZEXPORT zError(err) return ERR_MSG(err); } -#if defined(_WIN32_WCE) - /* The Microsoft C Run-Time Library for Windows CE doesn't have +#if defined(_WIN32_WCE) && _WIN32_WCE < 0x800 + /* The older Microsoft C Run-Time Library for Windows CE doesn't have * errno. We define it as a global variable to simplify porting. * Its value is always 0 and should not be used. */ -- cgit v1.2.1