aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2015-08-05 10:45:03 +0200
committerBjörn Gustavsson <[email protected]>2015-08-05 10:45:03 +0200
commit7716e9b630b96d7f3b135c88a5be4b54967e8181 (patch)
treef5b983c4dd9707d7ffbcc832e0a03fc6a611cd0e /erts/emulator
parente05f0b617f85547cc3c537dda3678d9c9a0e80c1 (diff)
parentb3b9d321ce0622e1d774ad54e9700e22edde8abd (diff)
downloadotp-7716e9b630b96d7f3b135c88a5be4b54967e8181.tar.gz
otp-7716e9b630b96d7f3b135c88a5be4b54967e8181.tar.bz2
otp-7716e9b630b96d7f3b135c88a5be4b54967e8181.zip
Merge branch 'bjorn/erts/beam_debug' into maint
* bjorn/erts/beam_debug: Fix crash when disassembling modules with BIFs
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/beam/beam_debug.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/beam_debug.c b/erts/emulator/beam/beam_debug.c
index 8a35ad17c6..c774a70d4c 100644
--- a/erts/emulator/beam/beam_debug.c
+++ b/erts/emulator/beam/beam_debug.c
@@ -298,8 +298,8 @@ erts_debug_disassemble_1(BIF_ALIST_1)
(void) erts_bld_uword(NULL, &hsz, (BeamInstr) code_ptr);
hp = HAlloc(p, hsz);
addr = erts_bld_uword(&hp, NULL, (BeamInstr) code_ptr);
- ASSERT(is_atom(funcinfo[0]));
- ASSERT(is_atom(funcinfo[1]));
+ ASSERT(is_atom(funcinfo[0]) || funcinfo[0] == NIL);
+ ASSERT(is_atom(funcinfo[1]) || funcinfo[1] == NIL);
mfa = TUPLE3(hp, (Eterm) funcinfo[0], (Eterm) funcinfo[1], make_small((Eterm) funcinfo[2]));
hp += 4;
return TUPLE3(hp, addr, bin, mfa);