diff options
| author | Björn Gustavsson <[email protected]> | 2015-08-05 10:49:02 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2015-08-05 10:49:02 +0200 |
| commit | 2de87ad4d4f68d6ffd33ed3fa144809da94f7c81 (patch) | |
| tree | 61e1e025366303044dd9c28221750bb6a1dbe53d /erts/emulator | |
| parent | 85d2630e9b4c0f982b88528f5f9dd4dd2472de84 (diff) | |
| parent | 7716e9b630b96d7f3b135c88a5be4b54967e8181 (diff) | |
| download | otp-2de87ad4d4f68d6ffd33ed3fa144809da94f7c81.tar.gz otp-2de87ad4d4f68d6ffd33ed3fa144809da94f7c81.tar.bz2 otp-2de87ad4d4f68d6ffd33ed3fa144809da94f7c81.zip | |
Merge branch 'maint'
* maint:
Fix crash when disassembling modules with BIFs
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/beam/beam_debug.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/beam_debug.c b/erts/emulator/beam/beam_debug.c index ea1f2cd012..3a1d328bbd 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); |