aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-06-09 14:26:24 +0200
committerBjörn-Egil Dahlberg <[email protected]>2016-06-09 14:26:24 +0200
commit6a47b7c2c6cd467257e0bc65b8a0fa8ecd74cc13 (patch)
treef32eb9408577bbd31709acb93071df47dedbec5b /erts/emulator/beam
parent85b2e51b7307ddeab6fd5c4471ddec10c85d3363 (diff)
parent99655be9a918671b56846ff1731196c0d467f4cd (diff)
downloadotp-6a47b7c2c6cd467257e0bc65b8a0fa8ecd74cc13.tar.gz
otp-6a47b7c2c6cd467257e0bc65b8a0fa8ecd74cc13.tar.bz2
otp-6a47b7c2c6cd467257e0bc65b8a0fa8ecd74cc13.zip
Merge branch 'egil/fix-simple-crashdump-with-maps/OTP-13657'
* egil/fix-simple-crashdump-with-maps/OTP-13657: erts: Don't crash on maps on crash dumps
Diffstat (limited to 'erts/emulator/beam')
-rw-r--r--erts/emulator/beam/erl_process_dump.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_process_dump.c b/erts/emulator/beam/erl_process_dump.c
index eeaa9a569c..a70dfb8e73 100644
--- a/erts/emulator/beam/erl_process_dump.c
+++ b/erts/emulator/beam/erl_process_dump.c
@@ -560,6 +560,11 @@ dump_externally(int to, void *to_arg, Eterm term)
}
}
+ /* Do not handle maps */
+ if (is_map(term)) {
+ term = am_undefined;
+ }
+
s = p = sbuf;
erts_encode_ext(term, &p);
erts_print(to, to_arg, "E%X:", p-s);