diff options
| author | Björn Gustavsson <[email protected]> | 2016-09-15 10:16:28 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-09-15 10:16:28 +0200 |
| commit | fde238fb52133a6c7a2a3f2a2e16f1c1bef62394 (patch) | |
| tree | 0e553f298c23f508975635a121fbf8356c58ab8a /erts/emulator/beam/module.h | |
| parent | cebef1207eca1cdc8c601b172988a74fd0858efa (diff) | |
| parent | 359e05121dab023585715b0e42506afd94f2e1f1 (diff) | |
| download | otp-fde238fb52133a6c7a2a3f2a2e16f1c1bef62394.tar.gz otp-fde238fb52133a6c7a2a3f2a2e16f1c1bef62394.tar.bz2 otp-fde238fb52133a6c7a2a3f2a2e16f1c1bef62394.zip | |
Merge branch 'bjorn/erts/on_load/ERL-240/OTP-13893' into maint
* bjorn/erts/on_load/ERL-240/OTP-13893:
erts: Add nif_SUITE:t_on_load
erts: Improve nif_SUITE:upgrade test
Don't leak old code when loading a modules with an on_load function
Diffstat (limited to 'erts/emulator/beam/module.h')
| -rw-r--r-- | erts/emulator/beam/module.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/module.h b/erts/emulator/beam/module.h index 5a60bc90d9..1c1afc8461 100644 --- a/erts/emulator/beam/module.h +++ b/erts/emulator/beam/module.h @@ -39,6 +39,7 @@ typedef struct erl_module { struct erl_module_instance curr; struct erl_module_instance old; /* protected by "old_code" rwlock */ + struct erl_module_instance* on_load; } Module; Module* erts_get_module(Eterm mod, ErtsCodeIndex code_ix); |