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/global.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/global.h')
| -rw-r--r-- | erts/emulator/beam/global.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h index 1abcc6cbf4..b76b9cd874 100644 --- a/erts/emulator/beam/global.h +++ b/erts/emulator/beam/global.h @@ -947,7 +947,7 @@ ERTS_GLB_INLINE Eterm erts_equeue_get(ErtsEQueue *q) { void erts_emasculate_writable_binary(ProcBin* pb); Eterm erts_new_heap_binary(Process *p, byte *buf, int len, byte** datap); -Eterm erts_new_mso_binary(Process*, byte*, int); +Eterm erts_new_mso_binary(Process*, byte*, Uint); Eterm new_binary(Process*, byte*, Uint); Eterm erts_realloc_binary(Eterm bin, size_t size); |