aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2017-05-05 14:55:36 +0200
committerLukas Larsson <[email protected]>2017-05-05 14:55:36 +0200
commit900affc2420905ec70f3cf906324093fc0c2e8a8 (patch)
treec7182580990b714d18704a4c3f105a69266a829b /erts
parent9ac8bdb19f55c593b8b4b10a5d72032e33bef406 (diff)
downloadotp-900affc2420905ec70f3cf906324093fc0c2e8a8.tar.gz
otp-900affc2420905ec70f3cf906324093fc0c2e8a8.tar.bz2
otp-900affc2420905ec70f3cf906324093fc0c2e8a8.zip
erts: the esdp is not always available in matchspec
This happens for instance when a receive_trace is run in the sys_msg_dispatcher thread when the trace_delivered trace message is traced.
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/beam/erl_db_util.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_db_util.c b/erts/emulator/beam/erl_db_util.c
index 91ac53ad0b..16142e69fb 100644
--- a/erts/emulator/beam/erl_db_util.c
+++ b/erts/emulator/beam/erl_db_util.c
@@ -2006,7 +2006,8 @@ restart:
do_catch = 0;
fail_label = -1;
build_proc = psp;
- esdp->current_process = psp;
+ if (esdp)
+ esdp->current_process = psp;
#ifdef DEBUG
ASSERT(variables == mpsp->u.variables);
@@ -2675,7 +2676,8 @@ restart:
do_catch = 1;
if (in_flags & ERTS_PAM_COPY_RESULT) {
build_proc = c_p;
- esdp->current_process = c_p;
+ if (esdp)
+ esdp->current_process = c_p;
}
break;
case matchHalt: