aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2019-06-10 18:21:52 +0200
committerSverker Eriksson <[email protected]>2019-06-10 18:21:52 +0200
commit1fdf8792606ec8b6e000e17f676b340e88550633 (patch)
tree303cb87d49637d8549342faac5a8dd88195135df /erts
parentf388a833d38f1ff56c36608d3a0616f006e352dd (diff)
parenta46a4a7618b37425daf8b52538611fd66cfb8a9d (diff)
downloadotp-1fdf8792606ec8b6e000e17f676b340e88550633.tar.gz
otp-1fdf8792606ec8b6e000e17f676b340e88550633.tar.bz2
otp-1fdf8792606ec8b6e000e17f676b340e88550633.zip
Merge branch 'maint'
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/beam/break.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/erts/emulator/beam/break.c b/erts/emulator/beam/break.c
index 80e871aaf6..6379e4e04d 100644
--- a/erts/emulator/beam/break.c
+++ b/erts/emulator/beam/break.c
@@ -84,8 +84,9 @@ process_info(fmtfn_t to, void *to_arg)
* they are most likely just created and has invalid data
*/
if (p->heap != NULL) {
- ErtsProcLocks locks = (p == esdp->current_process ||
- p == esdp->free_process) ? ERTS_PROC_LOCK_MAIN : 0;
+ ErtsProcLocks locks = ((esdp && (p == esdp->current_process ||
+ p == esdp->free_process))
+ ? ERTS_PROC_LOCK_MAIN : 0);
print_process_info(to, to_arg, p, locks);
}
}