]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-98689: Update Windows builds to zlib v1.2.13 (GH-98968)
authorZachary Ware <zach@python.org>
Tue, 1 Nov 2022 18:02:51 +0000 (13:02 -0500)
committerGitHub <noreply@github.com>
Tue, 1 Nov 2022 18:02:51 +0000 (13:02 -0500)
Misc/NEWS.d/next/Windows/2022-11-01-11-07-33.gh-issue-98689.0f6e_N.rst [new file with mode: 0644]
PCbuild/get_externals.bat
PCbuild/python.props

diff --git a/Misc/NEWS.d/next/Windows/2022-11-01-11-07-33.gh-issue-98689.0f6e_N.rst b/Misc/NEWS.d/next/Windows/2022-11-01-11-07-33.gh-issue-98689.0f6e_N.rst
new file mode 100644 (file)
index 0000000..295debb
--- /dev/null
@@ -0,0 +1,2 @@
+Update Windows builds to zlib v1.2.13.  v1.2.12 has CVE-2022-37434, but
+the vulnerable ``inflateGetHeader`` API is not used by Python.
index 681c79f85d0c94388eb8a3d2b6dd0a9b0c8874ae..98cca979fdfcd0cd4b9bd33e3afb009afc546706 100644 (file)
@@ -59,7 +59,7 @@ if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.12.
 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.12.1
 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6
 set libraries=%libraries%                                       xz-5.2.5
-set libraries=%libraries%                                       zlib-1.2.12
+set libraries=%libraries%                                       zlib-1.2.13
 
 for %%e in (%libraries%) do (
     if exist "%EXTERNALS_DIR%\%%e" (
index 5fa32dfffd17da7c448faa870504a01c3795d479..320d41f4cc20d85ceec8415ab77251bff0ab0472 100644 (file)
@@ -71,7 +71,7 @@
     <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1q\$(ArchName)\</opensslOutDir>
     <opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir>
     <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
-    <zlibDir>$(ExternalsDir)\zlib-1.2.12\</zlibDir>
+    <zlibDir>$(ExternalsDir)\zlib-1.2.13\</zlibDir>
     
     <!-- Suffix for all binaries when building for debug -->
     <PyDebugExt Condition="'$(PyDebugExt)' == '' and $(Configuration) == 'Debug'">_d</PyDebugExt>