diff options
| author | Juan Linietsky | 2017-01-02 19:12:25 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2017-01-02 19:12:25 -0300 |
| commit | ce26eb74bca48f16e9a34b4eb1c34e50dfc5daae (patch) | |
| tree | 5f9c387037d0142d40f7275575436483dc0a7237 /thirdparty/libwebp/utils/utils.h | |
| parent | ab4126f51061277e87b41c48b40e7b54942d4eca (diff) | |
| parent | 45c5c89de961357a7042d9e1f063e288d7a510cf (diff) | |
| download | godot-ce26eb74bca48f16e9a34b4eb1c34e50dfc5daae.tar.gz godot-ce26eb74bca48f16e9a34b4eb1c34e50dfc5daae.tar.zst godot-ce26eb74bca48f16e9a34b4eb1c34e50dfc5daae.zip | |
Diffstat (limited to 'thirdparty/libwebp/utils/utils.h')
| -rw-r--r-- | thirdparty/libwebp/utils/utils.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/thirdparty/libwebp/utils/utils.h b/thirdparty/libwebp/utils/utils.h index e0a81126d..3a5d4e6a7 100644 --- a/thirdparty/libwebp/utils/utils.h +++ b/thirdparty/libwebp/utils/utils.h @@ -20,6 +20,7 @@ #endif #include <assert.h> +#include <limits.h> #include "../dsp/dsp.h" #include "../webp/types.h" @@ -32,7 +33,14 @@ extern "C" { // Memory allocation // This is the maximum memory amount that libwebp will ever try to allocate. -#define WEBP_MAX_ALLOCABLE_MEMORY (1ULL << 40) +#ifndef WEBP_MAX_ALLOCABLE_MEMORY +#if SIZE_MAX > (1ULL << 34) +#define WEBP_MAX_ALLOCABLE_MEMORY (1ULL << 34) +#else +// For 32-bit targets keep this below INT_MAX to avoid valgrind warnings. +#define WEBP_MAX_ALLOCABLE_MEMORY ((1ULL << 31) - (1 << 16)) +#endif +#endif // WEBP_MAX_ALLOCABLE_MEMORY // size-checking safe malloc/calloc: verify that the requested size is not too // large, or return NULL. You don't need to call these for constructs like |