diff options
| author | Rickard Green <[email protected]> | 2014-03-31 15:43:36 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-03-31 15:43:36 +0200 |
| commit | c319be4bc33ceb205c48ed708bf53874207621bb (patch) | |
| tree | 68de02148e7dae2998050af0c3dbd83a0cf43e33 /erts/emulator/beam/beam_emu.c | |
| parent | 841ed47354afb2ac15f17e945d82e569f17ca1ae (diff) | |
| parent | 4ec8d3be1936bda8cb69a97619e7b7796c54948a (diff) | |
| download | otp-c319be4bc33ceb205c48ed708bf53874207621bb.tar.gz otp-c319be4bc33ceb205c48ed708bf53874207621bb.tar.bz2 otp-c319be4bc33ceb205c48ed708bf53874207621bb.zip | |
Merge branch 'vinoski/dirty-nif-purge'
* vinoski/dirty-nif-purge:
prevent NIF purge during dirty NIF execution
fix dirty NIF invalid memory read
Diffstat (limited to 'erts/emulator/beam/beam_emu.c')
| -rw-r--r-- | erts/emulator/beam/beam_emu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index 9634faff1d..1026e5f649 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -3525,7 +3525,7 @@ get_map_elements_fail: erts_post_nif(&env); #ifdef ERTS_DIRTY_SCHEDULERS if (is_non_value(nif_bif_result) && c_p->freason == TRAP) { - Export* ep = (Export*) c_p->psd->data[ERTS_PSD_DIRTY_SCHED_TRAP_EXPORT]; + Export* ep = ERTS_PROC_GET_DIRTY_SCHED_TRAP_EXPORT(c_p); ep->code[0] = I[-3]; ep->code[1] = I[-2]; } |