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.c | |
| 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.c')
| -rw-r--r-- | erts/emulator/beam/module.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/erts/emulator/beam/module.c b/erts/emulator/beam/module.c index 3eb11f1693..4f36377450 100644 --- a/erts/emulator/beam/module.c +++ b/erts/emulator/beam/module.c @@ -85,6 +85,7 @@ static Module* module_alloc(Module* tmpl) obj->old.num_breakpoints = 0; obj->curr.num_traced_exports = 0; obj->old.num_traced_exports = 0; + obj->on_load = 0; return obj; } @@ -201,6 +202,7 @@ void module_start_staging(void) dst_mod->curr = src_mod->curr; dst_mod->old = src_mod->old; + dst_mod->on_load = src_mod->on_load; } /* @@ -214,6 +216,7 @@ void module_start_staging(void) dst_mod->curr = src_mod->curr; dst_mod->old = src_mod->old; + dst_mod->on_load = src_mod->on_load; } newsz = index_table_sz(dst); erts_smp_atomic_add_nob(&tot_module_bytes, (newsz - oldsz)); |