Skip to content

Commit bfe4528

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 28b836c commit bfe4528

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
-16985
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
@@ -130,6 +130,7 @@ Files extracted from upstream source:
130130

131131
- `src/` folder, minus the `dlg` and `tools` subfolders
132132
* These files can be removed: `.dat`, `.diff`, `.mk`, `.rc`, `README*`
133+
* In `src/gzip/`, remove zlib files (everything but `ftgzip.c` and `ftzconf.h`)
133134
- `include/` folder, minus the `dlg` subfolder
134135
- `LICENSE.TXT` and `docs/FTL.TXT`
135136

@@ -324,12 +325,14 @@ https://github.com/miniupnp/miniupnp/commit/3a08dd4b89af2e9effa22a136bac86f2f306
324325
## minizip
325326

326327
- Upstream: https://www.zlib.net
327-
- Version: 1.2.12 (zlib contrib, 2022)
328+
- Version: 1.2.13 (zlib contrib, 2022)
328329
- License: zlib
329330

330331
Files extracted from the upstream source:
331332

332-
- contrib/minizip/{crypt.h,ioapi.{c,h},unzip.{c,h},zip.{c,h}}
333+
- From `contrib/minizip`:
334+
`{crypt.h,ioapi.{c,h},unzip.{c,h},zip.{c,h}}`
335+
`MiniZip64_info.txt`
333336

334337
Important: Some files have Godot-made changes for use in core/io.
335338
They are marked with `/* GODOT start */` and `/* GODOT end */`
@@ -567,12 +570,13 @@ Files extracted from upstream source:
567570
## zlib
568571

569572
- Upstream: https://www.zlib.net
570-
- Version: 1.2.12 (2022)
573+
- Version: 1.2.13 (2022)
571574
- License: zlib
572575

573576
Files extracted from upstream source:
574577

575-
- all .c and .h files
578+
- All `*.c` and `*.h` files
579+
- `LICENSE`
576580

577581

578582
## zstd

thirdparty/freetype/src/gzip/adler32.c

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

0 commit comments

Comments
 (0)