Skip to content

Commit 387f93c

Browse files
bpo-47194: Update zlib to v1.2.12 on Windows to resolve CVE-2018-25032 (GH-32241) (GH-32251)
(cherry picked from commit 6066739) Co-authored-by: Zachary Ware <[email protected]>
1 parent d97497b commit 387f93c

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update ``zlib`` to v1.2.12 to resolve CVE-2018-25032.

PCbuild/get_externals.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.9.0
5555
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.9.0
5656
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6
5757
set libraries=%libraries% xz-5.2.2
58-
set libraries=%libraries% zlib-1.2.11
58+
set libraries=%libraries% zlib-1.2.12
5959

6060
for %%e in (%libraries%) do (
6161
if exist "%EXTERNALS_DIR%\%%e" (

PCbuild/python.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1n\$(ArchName)\</opensslOutDir>
5454
<opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir>
5555
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
56-
<zlibDir>$(ExternalsDir)\zlib-1.2.11\</zlibDir>
56+
<zlibDir>$(ExternalsDir)\zlib-1.2.12\</zlibDir>
5757

5858
<!-- Suffix for all binaries when building for debug -->
5959
<PyDebugExt Condition="'$(PyDebugExt)' == '' and $(Configuration) == 'Debug'">_d</PyDebugExt>

0 commit comments

Comments
 (0)