aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2015-12-11 14:41:58 +0100
committerSverker Eriksson <[email protected]>2015-12-11 14:41:58 +0100
commit7d9d88e9adf040a17c8ffb01b069fb2a5d125dab (patch)
treeb730a393720758e6b0ef850296a541b768e64c47
parenta43b53d47e98c150b496cd80c244f1bacb536ada (diff)
parent63ea41015e6aa28415c3446b8dee5d5208cdeb85 (diff)
downloadotp-7d9d88e9adf040a17c8ffb01b069fb2a5d125dab.tar.gz
otp-7d9d88e9adf040a17c8ffb01b069fb2a5d125dab.tar.bz2
otp-7d9d88e9adf040a17c8ffb01b069fb2a5d125dab.zip
Merge branch 'maint'
-rw-r--r--erts/emulator/beam/dist.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c
index bab80654d5..e31ef29562 100644
--- a/erts/emulator/beam/dist.c
+++ b/erts/emulator/beam/dist.c
@@ -1214,11 +1214,11 @@ int erts_net_message(Port *prt,
arg = erts_decode_dist_ext(&factory, &ede);
if (is_non_value(arg)) {
#ifdef ERTS_DIST_MSG_DBG
- erts_fprintf(stderr, "DIST MSG DEBUG: erts_dist_ext_size(CTL) failed:\n");
+ erts_fprintf(stderr, "DIST MSG DEBUG: erts_decode_dist_ext(CTL) failed:\n");
bw(buf, orig_len);
#endif
PURIFY_MSG("data error");
- goto data_error;
+ goto decode_error;
}
ctl_len = t - buf;
@@ -1711,12 +1711,13 @@ int erts_net_message(Port *prt,
erts_dsprintf(dsbufp, "Invalid distribution message: %.200T", arg);
erts_send_error_to_logger_nogl(dsbufp);
}
- data_error:
+decode_error:
PURIFY_MSG("data error");
erts_factory_close(&factory);
if (ctl != ctl_default) {
erts_free(ERTS_ALC_T_DCTRL_BUF, (void *) ctl);
}
+data_error:
UnUseTmpHeapNoproc(DIST_CTL_DEFAULT_SIZE);
erts_deliver_port_exit(prt, dep->cid, am_killed, 0);
ERTS_SMP_CHK_NO_PROC_LOCKS;