aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2017-05-16 14:40:33 +0200
committerLukas Larsson <[email protected]>2017-05-16 14:40:33 +0200
commit4b6d1950d9c5fc506cea42c115db78d0d7299d4d (patch)
treee326719caf0923d53b4d5efcd9478a105e3baad5 /erts
parent1c141e44c400cf8cc0c99a16a9a166eaca56a511 (diff)
parent900affc2420905ec70f3cf906324093fc0c2e8a8 (diff)
downloadotp-4b6d1950d9c5fc506cea42c115db78d0d7299d4d.tar.gz
otp-4b6d1950d9c5fc506cea42c115db78d0d7299d4d.tar.bz2
otp-4b6d1950d9c5fc506cea42c115db78d0d7299d4d.zip
Merge branch 'lukas/erts/trace_recv_esdp_bug/OTP-14411'
* lukas/erts/trace_recv_esdp_bug/OTP-14411: erts: the esdp is not always available in matchspec
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 c9418c4aba..13eacaa8a9 100644
--- a/erts/emulator/beam/erl_db_util.c
+++ b/erts/emulator/beam/erl_db_util.c
@@ -2012,7 +2012,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);
@@ -2681,7 +2682,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: