diff options
| author | Lukas Larsson <[email protected]> | 2016-05-17 16:16:09 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-05-17 16:16:09 +0200 |
| commit | 0d6b5426898f7dd2fb099809cb171b2678a08d59 (patch) | |
| tree | f0589becbacbf888be762ebb4e83c69535cecdb0 /erts/emulator/beam/erl_process.h | |
| parent | 08829107836e959e3ca619f591e07f8f912cafbc (diff) | |
| parent | 325f700a35ecf3e50b8d679f504edbdd5a4ec1ab (diff) | |
| download | otp-0d6b5426898f7dd2fb099809cb171b2678a08d59.tar.gz otp-0d6b5426898f7dd2fb099809cb171b2678a08d59.tar.bz2 otp-0d6b5426898f7dd2fb099809cb171b2678a08d59.zip | |
Merge branch 'mikpe/otp-19-erts-integer-truncation-bugs/PR-1045/OTP-13606'
* mikpe/otp-19-erts-integer-truncation-bugs/PR-1045/OTP-13606:
erl_unicode.c: fix integer truncation problems
do not limit heap fragments to 4 giga-words
erts_new_mso_binary(): do not truncate len
Conflicts:
erts/emulator/beam/erl_nif.c
Diffstat (limited to 'erts/emulator/beam/erl_process.h')
| -rw-r--r-- | erts/emulator/beam/erl_process.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_process.h b/erts/emulator/beam/erl_process.h index 2fc6dfe194..b44ac442aa 100644 --- a/erts/emulator/beam/erl_process.h +++ b/erts/emulator/beam/erl_process.h @@ -1339,7 +1339,7 @@ ERTS_GLB_INLINE void erts_heap_frag_shrink(Process* p, Eterm* hp) { ErlHeapFragment* hf = MBUF(p); - ASSERT(hf!=NULL && (hp - hf->mem < (unsigned long)hf->alloc_size)); + ASSERT(hf!=NULL && (hp - hf->mem < hf->alloc_size)); hf->used_size = hp - hf->mem; } |