diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2022-11-01 18:30:40 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-01 18:30:40 (GMT) |
| commit | a2d45372022bccd6a151afc1701771d47d9450a3 (patch) | |
| tree | 5dc5e0bbe611de68ae238ad8a53eadbd2a0615f3 | |
| parent | 9ca7b1561f8a298a1d5917dcaae5a654ac0766b1 (diff) | |
| download | cpython-a2d45372022bccd6a151afc1701771d47d9450a3.zip cpython-a2d45372022bccd6a151afc1701771d47d9450a3.tar.gz cpython-a2d45372022bccd6a151afc1701771d47d9450a3.tar.bz2 | |
gh-98689: Update Windows builds to zlib v1.2.13 (GH-98968)
(cherry picked from commit c0859743d9ad3bbd4c021200f4162cfeadc0c17a)
Co-authored-by: Zachary Ware <zach@python.org>
| -rw-r--r-- | Misc/NEWS.d/next/Windows/2022-11-01-11-07-33.gh-issue-98689.0f6e_N.rst | 2 | ||||
| -rw-r--r-- | PCbuild/get_externals.bat | 2 | ||||
| -rw-r--r-- | PCbuild/python.props | 2 |
3 files changed, 4 insertions, 2 deletions
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 index 0000000..295debb --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2022-11-01-11-07-33.gh-issue-98689.0f6e_N.rst @@ -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. diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index f72c8f6..5776134 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -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.0 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" ( diff --git a/PCbuild/python.props b/PCbuild/python.props index 1db13d4..56060f7 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -67,7 +67,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> |