diff options
| author | Björn Gustavsson <[email protected]> | 2010-09-01 16:42:42 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2010-09-01 16:44:45 +0200 |
| commit | 70e929860ceb6448101828190f688697fff67db4 (patch) | |
| tree | 337f3dc935be80d950e6baf4fc0d5db3bf222d88 /erts/emulator/beam | |
| parent | 7f3922afdc69ba7cc8678c521b0be37c46112c67 (diff) | |
| parent | c04218394fdf84468b1163c4c832d64071bbc798 (diff) | |
| download | otp-70e929860ceb6448101828190f688697fff67db4.tar.gz otp-70e929860ceb6448101828190f688697fff67db4.tar.bz2 otp-70e929860ceb6448101828190f688697fff67db4.zip | |
Merge branch 'pg/fix-segfault-on-crash_dump-with-hipe' into dev
* pg/fix-segfault-on-crash_dump-with-hipe:
Fix segmentation fault when dumping the crash log with hipe enabled and natively compiled modules
OTP-8801
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/beam_load.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c index 74777e4c26..df5602b040 100644 --- a/erts/emulator/beam/beam_load.c +++ b/erts/emulator/beam/beam_load.c @@ -1379,8 +1379,10 @@ read_code_header(LoaderState* stp) stp->ci = MI_FUNCTIONS + stp->num_functions + 1; stp->code[MI_ATTR_PTR] = 0; + stp->code[MI_ATTR_SIZE] = 0; stp->code[MI_ATTR_SIZE_ON_HEAP] = 0; stp->code[MI_COMPILE_PTR] = 0; + stp->code[MI_COMPILE_SIZE] = 0; stp->code[MI_COMPILE_SIZE_ON_HEAP] = 0; stp->code[MI_NUM_BREAKPOINTS] = 0; @@ -5199,8 +5201,10 @@ erts_make_stub_module(Process* p, Eterm Mod, Eterm Beam, Eterm Info) code[MI_NUM_FUNCTIONS] = n; code[MI_ATTR_PTR] = 0; + code[MI_ATTR_SIZE] = 0; code[MI_ATTR_SIZE_ON_HEAP] = 0; code[MI_COMPILE_PTR] = 0; + code[MI_COMPILE_SIZE] = 0; code[MI_COMPILE_SIZE_ON_HEAP] = 0; code[MI_NUM_BREAKPOINTS] = 0; code[MI_ON_LOAD_FUNCTION_PTR] = 0; |