diff options
| author | Sverker Eriksson <[email protected]> | 2017-10-02 18:06:53 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2017-10-02 18:06:53 +0200 |
| commit | 4d2a2f5f327aa6804c37ef7fe0c41c2f58555239 (patch) | |
| tree | ee6335231786091dc89dc7248771fb0dcba9f4e0 /erts/emulator/beam/erl_message.c | |
| parent | 8d4b803946c2a287381a07e522b05dc556183d80 (diff) | |
| parent | 237d0c7d230534ef99a11d388ebfd0c1e83af548 (diff) | |
| download | otp-4d2a2f5f327aa6804c37ef7fe0c41c2f58555239.tar.gz otp-4d2a2f5f327aa6804c37ef7fe0c41c2f58555239.tar.bz2 otp-4d2a2f5f327aa6804c37ef7fe0c41c2f58555239.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam/erl_message.c')
| -rw-r--r-- | erts/emulator/beam/erl_message.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/erts/emulator/beam/erl_message.c b/erts/emulator/beam/erl_message.c index 3418a7f4df..abf194cf94 100644 --- a/erts/emulator/beam/erl_message.c +++ b/erts/emulator/beam/erl_message.c @@ -550,14 +550,11 @@ erts_msg_attached_data_size_aux(ErtsMessage *msg) sz = erts_decode_dist_ext_size(msg->data.dist_ext); if (sz < 0) { - /* Bad external; remove it */ - if (is_not_nil(ERL_MESSAGE_TOKEN(msg))) { - ErlHeapFragment *heap_frag; - heap_frag = erts_dist_ext_trailer(msg->data.dist_ext); - erts_cleanup_offheap(&heap_frag->off_heap); - } - erts_free_dist_ext_copy(msg->data.dist_ext); - msg->data.dist_ext = NULL; + /* Bad external + * We leave the message intact in this case as it's not worth the trouble + * to make all callers remove it from queue. It will be detected again + * and removed from message queue later anyway. + */ return 0; } |