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/zlib/zconf.h | |
| parent | 163f6f5fe87d11645e94cd49f41226ab03063e53 (diff) | |
| download | redot-engine-93409b8e64a9bc3c271ab4a7489b59a43bc0d048.tar.gz | |
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/zlib/zconf.h')
| -rw-r--r-- | thirdparty/zlib/zconf.h | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/thirdparty/zlib/zconf.h b/thirdparty/zlib/zconf.h index 5e1d68a004..bf977d3e70 100644 --- a/thirdparty/zlib/zconf.h +++ b/thirdparty/zlib/zconf.h @@ -38,6 +38,9 @@ # define crc32 z_crc32 # define crc32_combine z_crc32_combine # define crc32_combine64 z_crc32_combine64 +# define crc32_combine_gen z_crc32_combine_gen +# define crc32_combine_gen64 z_crc32_combine_gen64 +# define crc32_combine_op z_crc32_combine_op # define crc32_z z_crc32_z # define deflate z_deflate # define deflateBound z_deflateBound @@ -349,6 +352,9 @@ # ifdef FAR # undef FAR # endif +# ifndef WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +# endif # include <windows.h> /* No need for _export, use ZLIB.DEF instead. */ /* For complete Windows compatibility, use WINAPI, not __stdcall. */ @@ -467,11 +473,18 @@ typedef uLong FAR uLongf; # undef _LARGEFILE64_SOURCE #endif -#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H) -# define Z_HAVE_UNISTD_H +#ifndef Z_HAVE_UNISTD_H +# ifdef __WATCOMC__ +# define Z_HAVE_UNISTD_H +# endif +#endif +#ifndef Z_HAVE_UNISTD_H +# if defined(_LARGEFILE64_SOURCE) && !defined(_WIN32) +# define Z_HAVE_UNISTD_H +# endif #endif #ifndef Z_SOLO -# if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE) +# if defined(Z_HAVE_UNISTD_H) # include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */ # ifdef VMS # include <unixio.h> /* for off_t */ |