diff options
| author | Sverker Eriksson <[email protected]> | 2018-12-18 14:45:00 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-12-18 14:45:00 +0100 |
| commit | 829166ecdb3d40161d3b53485549fb9064548da8 (patch) | |
| tree | 3dc98ccf5f74a61914a99a0290c897a3dbec52f9 | |
| parent | ea262e24e4b9d019cf253aa9a8fbcd907c2d91eb (diff) | |
| parent | 1e6ab2fdac21c7847b7fda32fed1ea35883a535e (diff) | |
| download | otp-829166ecdb3d40161d3b53485549fb9064548da8.tar.gz otp-829166ecdb3d40161d3b53485549fb9064548da8.tar.bz2 otp-829166ecdb3d40161d3b53485549fb9064548da8.zip | |
Merge branch 'sverker/fix-atomics-get-large-unsigned/PR-2061/OTP-15486' into maint
* sverker/fix-atomics-get-large-unsigned/PR-2061/OTP-15486:
erts: Fix possible heap corruption getting atomics
| -rw-r--r-- | erts/emulator/beam/erl_bif_atomics.c | 2 | ||||
| -rw-r--r-- | erts/emulator/test/atomics_SUITE.erl | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_bif_atomics.c b/erts/emulator/beam/erl_bif_atomics.c index 092dbb3bd3..029831bd95 100644 --- a/erts/emulator/beam/erl_bif_atomics.c +++ b/erts/emulator/beam/erl_bif_atomics.c @@ -133,7 +133,7 @@ static ERTS_INLINE Eterm bld_atomic(Process* proc, AtomicsRef* p, if ((Uint64)val <= MAX_SMALL) return make_small((Sint) val); else { - Uint hsz = ERTS_UINT64_HEAP_SIZE(val); + Uint hsz = ERTS_UINT64_HEAP_SIZE((Uint64)val); Eterm* hp = HAlloc(proc, hsz); return erts_uint64_to_big(val, &hp); } diff --git a/erts/emulator/test/atomics_SUITE.erl b/erts/emulator/test/atomics_SUITE.erl index 8c42354770..a5407c42ee 100644 --- a/erts/emulator/test/atomics_SUITE.erl +++ b/erts/emulator/test/atomics_SUITE.erl @@ -126,6 +126,9 @@ unsigned_limits(Config) when is_list(Config) -> Min = atomics:add_get(Ref, 1, 1), Max = atomics:sub_get(Ref, 1, 1), + atomics:put(Ref, 1, Max), + io:format("Max=~p~n", [atomics:get(Ref, 1)]), + {'EXIT',{badarg,_}} = (catch atomics:add(Ref, 1, Max+1)), IncrMin = -(1 bsl (Bits-1)), ok = atomics:put(Ref, 1, -IncrMin), |