diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-01-20 22:50:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-20 22:50:39 +0100 |
| commit | cfb986c6318f61b4b67bc3af4188c06a0717bd9a (patch) | |
| tree | 373b028bfbae8d082db1038e222b70543c111185 /core/io | |
| parent | e6170aae39194a6ada312ff8a3f53a36bf16aff8 (diff) | |
| parent | bd448e5535686a4473d185f4103b4ac4dedf0c71 (diff) | |
Merge pull request #51452 from omar-polo/fix-macros
Diffstat (limited to 'core/io')
| -rw-r--r-- | core/io/marshalls.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/io/marshalls.cpp b/core/io/marshalls.cpp index 6a0668f027..555d4f6df4 100644 --- a/core/io/marshalls.cpp +++ b/core/io/marshalls.cpp @@ -52,9 +52,8 @@ ObjectID EncodedObjectAsID::get_object_id() const { return id; } -#define _S(a) ((int32_t)a) -#define ERR_FAIL_ADD_OF(a, b, err) ERR_FAIL_COND_V(_S(b) < 0 || _S(a) < 0 || _S(a) > INT_MAX - _S(b), err) -#define ERR_FAIL_MUL_OF(a, b, err) ERR_FAIL_COND_V(_S(a) < 0 || _S(b) <= 0 || _S(a) > INT_MAX / _S(b), err) +#define ERR_FAIL_ADD_OF(a, b, err) ERR_FAIL_COND_V(((int32_t)(b)) < 0 || ((int32_t)(a)) < 0 || ((int32_t)(a)) > INT_MAX - ((int32_t)(b)), err) +#define ERR_FAIL_MUL_OF(a, b, err) ERR_FAIL_COND_V(((int32_t)(a)) < 0 || ((int32_t)(b)) <= 0 || ((int32_t)(a)) > INT_MAX / ((int32_t)(b)), err) #define ENCODE_MASK 0xFF #define ENCODE_FLAG_64 1 << 16 |