diff options
| author | Lukas Larsson <[email protected]> | 2014-08-14 09:44:29 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-08-14 09:44:29 +0200 |
| commit | 9de7cc7f881b5df18d0a26f7d37af164bc0c390e (patch) | |
| tree | b72c97468a188307915f707f0d2133f719719f0d /erts/emulator/beam/big.h | |
| parent | 8fe6c462ec8e20ab2ad14b0c1addf1030ada0e54 (diff) | |
| parent | 9d3c22934491afe85fbcf8543ae43fb2eb1ab387 (diff) | |
| download | otp-9de7cc7f881b5df18d0a26f7d37af164bc0c390e.tar.gz otp-9de7cc7f881b5df18d0a26f7d37af164bc0c390e.tar.bz2 otp-9de7cc7f881b5df18d0a26f7d37af164bc0c390e.zip | |
Merge branch 'lukas/erts/fix_neg_of_int64_min/OTP-12097' into maint
* lukas/erts/fix_neg_of_int64_min/OTP-12097:
erts: Fix neg int overflow when sint is min size
Diffstat (limited to 'erts/emulator/beam/big.h')
| -rw-r--r-- | erts/emulator/beam/big.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/big.h b/erts/emulator/beam/big.h index d80111822e..da31876d75 100644 --- a/erts/emulator/beam/big.h +++ b/erts/emulator/beam/big.h @@ -101,7 +101,7 @@ typedef Uint dsize_t; /* Vector size type */ #define ERTS_SINT64_HEAP_SIZE(X) \ (IS_SSMALL((X)) \ ? 0 \ - : ERTS_UINT64_BIG_HEAP_SIZE__((X) >= 0 ? (X) : -(X))) + : ERTS_UINT64_BIG_HEAP_SIZE__((X) >= 0 ? (X) : -(Uint64)(X))) #define ERTS_UINT64_HEAP_SIZE(X) \ (IS_USMALL(0, (X)) ? 0 : ERTS_UINT64_BIG_HEAP_SIZE__((X))) |