aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/dist.c
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2019-03-22 13:31:21 +0100
committerLukas Larsson <[email protected]>2019-03-25 16:34:11 +0100
commit87c2fb2e0b1d376a367a4066703db342faadd6d5 (patch)
treed78b8d58d3ba517db709af7e61f6207e1ebe76ba /erts/emulator/beam/dist.c
parent9eb5e4dc76690ab4059bf94848e41e87cf5606b1 (diff)
downloadotp-87c2fb2e0b1d376a367a4066703db342faadd6d5.tar.gz
otp-87c2fb2e0b1d376a367a4066703db342faadd6d5.tar.bz2
otp-87c2fb2e0b1d376a367a4066703db342faadd6d5.zip
erts: Fix non-payload dist exit signals
When interacting with jinterface and erl_interface the old dist messages are used and they incorrectly used the external data.
Diffstat (limited to 'erts/emulator/beam/dist.c')
-rw-r--r--erts/emulator/beam/dist.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c
index 4c200ecc83..8669cc16c9 100644
--- a/erts/emulator/beam/dist.c
+++ b/erts/emulator/beam/dist.c
@@ -1913,6 +1913,7 @@ int erts_net_message(Port *prt,
goto invalid_message;
}
reason = tuple[5];
+ edep = NULL;
}
if (is_not_ref(ref))
@@ -1959,12 +1960,14 @@ int erts_net_message(Port *prt,
}
token = NIL;
reason = tuple[4];
+ edep = NULL;
} else if (type == DOP_EXIT_TT){
if (tuple_arity != 5) {
goto invalid_message;
}
token = tuple[4];
reason = tuple[5];
+ edep = NULL;
} else if (type == DOP_PAYLOAD_EXIT) {
if (tuple_arity != 3) {
goto invalid_message;
@@ -2012,12 +2015,14 @@ int erts_net_message(Port *prt,
}
reason = tuple[4];
token = NIL;
+ edep = NULL;
} else if (type == DOP_EXIT2_TT) {
if (tuple_arity != 5) {
goto invalid_message;
}
token = tuple[4];
reason = tuple[5];
+ edep = NULL;
} else if (type == DOP_PAYLOAD_EXIT2) {
if (tuple_arity != 3) {
goto invalid_message;