Skip to content

Commit 23d4956

Browse files
DeeJayLSPakien-mga
andcommitted
zlib/minizip: Update to version 1.2.13, remove zlib from freetype
Security update, fixes CVE-2022-37434 in zlib. Only applications exposing/using `inflateGetHeader()` seem to be affected, which is not our case, so this is not critical for Godot. Remove duplicated copy of zlib in freetype sources to force using the updated version in `thirdparty/zlib/`. Co-authored-by: Rémi Verschelde <[email protected]> (cherry picked from commit 93409b8)
1 parent a5bd4dc commit 23d4956

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+317
-3479
lines changed

COPYRIGHT.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ License: Expat
391391

392392
Files: ./thirdparty/zlib/
393393
Comment: zlib
394-
Copyright: 1995-2017, Jean-loup Gailly and Mark Adler
394+
Copyright: 1995-2022, Jean-loup Gailly and Mark Adler
395395
License: Zlib
396396

397397
Files: ./thirdparty/zstd/

thirdparty/README.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ comments.
129129
Files extracted from upstream source:
130130

131131
- the `src/` folder, stripped of the `Jamfile` files and the `tools` subfolder
132+
* In `src/gzip/`, remove zlib files (everything but `ftgzip.c` and `ftzconf.h`)
132133
- the `include/` folder
133134
- `docs/{FTL.TXT,LICENSE.TXT}`
134135

@@ -318,12 +319,14 @@ https://github.com/miniupnp/miniupnp/commit/3a08dd4b89af2e9effa22a136bac86f2f306
318319
## minizip
319320

320321
- Upstream: https://www.zlib.net
321-
- Version: 1.2.12 (zlib contrib, 2022)
322+
- Version: 1.2.13 (zlib contrib, 2022)
322323
- License: zlib
323324

324325
Files extracted from the upstream source:
325326

326-
- contrib/minizip/{crypt.h,ioapi.{c,h},unzip.{c,h},zip.{c,h}}
327+
- From `contrib/minizip`:
328+
`{crypt.h,ioapi.{c,h},unzip.{c,h},zip.{c,h}}`
329+
`MiniZip64_info.txt`
327330

328331
Important: Some files have Godot-made changes for use in core/io.
329332
They are marked with `/* GODOT start */` and `/* GODOT end */`
@@ -561,12 +564,13 @@ Files extracted from upstream source:
561564
## zlib
562565

563566
- Upstream: https://www.zlib.net
564-
- Version: 1.2.12 (2022)
567+
- Version: 1.2.13 (2022)
565568
- License: zlib
566569

567570
Files extracted from upstream source:
568571

569-
- all .c and .h files
572+
- All `*.c` and `*.h` files
573+
- `LICENSE`
570574

571575

572576
## zstd

thirdparty/freetype/src/gzip/adler32.c

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)