diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-03-31 14:14:05 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-03-31 15:19:11 +0200 |
| commit | 420d0d50bcdc47c793157c2f1e143136eafa6500 (patch) | |
| tree | 375213d3f3b14f97cb4dd8c8d9ccb4e54ca80105 /thirdparty/minizip/ioapi.h | |
| parent | a647fb3e623c8e5c14427c2631ee61f132951709 (diff) | |
| download | redot-engine-420d0d50bcdc47c793157c2f1e143136eafa6500.tar.gz | |
zlib/minizip: Update to version 1.2.12
Security update, fixes CVE-2018-25032 in zlib.
Preliminary assessment doesn't show Godot as affected since we don't
seem to call `deflate` with the problematic parameters, but the extent
of the vulnerability is not fully clear upstream yet.
Diffstat (limited to 'thirdparty/minizip/ioapi.h')
| -rw-r--r-- | thirdparty/minizip/ioapi.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/thirdparty/minizip/ioapi.h b/thirdparty/minizip/ioapi.h index 4011e9cabb..e9e5899852 100644 --- a/thirdparty/minizip/ioapi.h +++ b/thirdparty/minizip/ioapi.h @@ -107,8 +107,7 @@ typedef 64BIT_INT_CUSTOM_TYPE ZPOS64_T; typedef uint64_t ZPOS64_T; #else -/* Maximum unsigned 32-bit value used as placeholder for zip64 */ -#define MAXU32 0xffffffff + #if defined(_MSC_VER) || defined(__BORLANDC__) typedef unsigned __int64 ZPOS64_T; @@ -118,7 +117,10 @@ typedef unsigned long long int ZPOS64_T; #endif #endif - +/* Maximum unsigned 32-bit value used as placeholder for zip64 */ +#ifndef MAXU32 +#define MAXU32 (0xffffffff) +#endif #ifdef __cplusplus extern "C" { |