diff options
| author | DeeJayLSP <djlsplays@gmail.com> | 2022-11-30 11:16:31 -0300 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-07 13:03:06 +0100 |
| commit | 93409b8e64a9bc3c271ab4a7489b59a43bc0d048 (patch) | |
| tree | bdc406e5e4861818ec5b4b9a36c4fa1b9850b3f6 /thirdparty/minizip/unzip.c | |
| parent | 163f6f5fe87d11645e94cd49f41226ab03063e53 (diff) | |
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 <rverschelde@gmail.com>
Diffstat (limited to 'thirdparty/minizip/unzip.c')
| -rw-r--r-- | thirdparty/minizip/unzip.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/thirdparty/minizip/unzip.c b/thirdparty/minizip/unzip.c index 3b191e827c..e83aff2773 100644 --- a/thirdparty/minizip/unzip.c +++ b/thirdparty/minizip/unzip.c @@ -112,7 +112,7 @@ # define ALLOC(size) (malloc(size)) #endif #ifndef TRYFREE -# define TRYFREE(p) {if (p) free(p);} +# define TRYFREE(p) { free(p);} #endif #define SIZECENTRALDIRITEM (0x2e) @@ -1595,6 +1595,7 @@ extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method, pfile_in_zip_read_info->stream_initialised=Z_BZIP2ED; else { + TRYFREE(pfile_in_zip_read_info->read_buffer); TRYFREE(pfile_in_zip_read_info); return err; } @@ -1617,6 +1618,7 @@ extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method, pfile_in_zip_read_info->stream_initialised=Z_DEFLATED; else { + TRYFREE(pfile_in_zip_read_info->read_buffer); TRYFREE(pfile_in_zip_read_info); return err; } |