diff options
| author | Björn Gustavsson <[email protected]> | 2012-02-07 09:00:22 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2012-02-07 09:00:22 +0100 |
| commit | 0c399a77db7eba81f13baccb1f19517991619f4e (patch) | |
| tree | 2472685fc5b7911a79ede6c23291798802fdd9cc /erts/emulator/beam/beam_load.c | |
| parent | ee20527da3c90d1f7c10e7702237f9c71e23a3cd (diff) | |
| parent | 741eb5821beba958eafba23f11b1f115f63dd75e (diff) | |
| download | otp-0c399a77db7eba81f13baccb1f19517991619f4e.tar.gz otp-0c399a77db7eba81f13baccb1f19517991619f4e.tar.bz2 otp-0c399a77db7eba81f13baccb1f19517991619f4e.zip | |
Merge branch 'bjorn/erts/bif-stubs/OTP-9861'
* bjorn/erts/bif-stubs/OTP-9861:
beam_bp: Fix faulty assertion in erts_find_local_func()
beam_load: Fix faulty assertion in module_info(native_addresses)
Diffstat (limited to 'erts/emulator/beam/beam_load.c')
| -rw-r--r-- | erts/emulator/beam/beam_load.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c index 1f9635a6c1..d54fe603d8 100644 --- a/erts/emulator/beam/beam_load.c +++ b/erts/emulator/beam/beam_load.c @@ -5158,9 +5158,11 @@ native_addresses(Process* p, Eterm mod) int arity = (int) func_info[4]; Eterm tuple; - ASSERT(is_atom(name)); + ASSERT(is_atom(name) || is_nil(name)); /* [] if BIF stub */ if (func_info[1] != 0) { - Eterm addr = erts_bld_uint(&hp, NULL, func_info[1]); + Eterm addr; + ASSERT(is_atom(name)); + addr = erts_bld_uint(&hp, NULL, func_info[1]); tuple = erts_bld_tuple(&hp, NULL, 3, name, make_small(arity), addr); result = erts_bld_cons(&hp, NULL, tuple, result); } |