diff options
| author | Henrik Nord <[email protected]> | 2015-03-12 12:11:13 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2015-03-12 12:11:13 +0100 |
| commit | 408c7dc8922a123aad815a24a27d7ff24971a253 (patch) | |
| tree | 9f1e874299e433c8e0cb9e344a96e922ac134199 /erts/emulator/beam/external.c | |
| parent | 43db415c05c20c1d0793ec994da265f02dc73e21 (diff) | |
| parent | faeb9e9a67096af4257cd00409f06314f3223196 (diff) | |
| download | otp-408c7dc8922a123aad815a24a27d7ff24971a253.tar.gz otp-408c7dc8922a123aad815a24a27d7ff24971a253.tar.bz2 otp-408c7dc8922a123aad815a24a27d7ff24971a253.zip | |
Merge branch 'maint'
Conflicts:
erts/emulator/hipe/hipe_bif0.c
Diffstat (limited to 'erts/emulator/beam/external.c')
| -rw-r--r-- | erts/emulator/beam/external.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/external.c b/erts/emulator/beam/external.c index 601cbe9d7d..e5fb2d3ec1 100644 --- a/erts/emulator/beam/external.c +++ b/erts/emulator/beam/external.c @@ -3059,6 +3059,8 @@ dec_term(ErtsDistExternal *edep, Eterm** hpp, byte* ep, ErlOffHeap* off_heap, big = make_small(0); } else { big = bytes_to_big(first, n, neg, hp); + if (is_nil(big)) + goto error; if (is_big(big)) { hp += big_arity(big) + 1; } |