diff options
| author | Björn Gustavsson <[email protected]> | 2011-02-14 14:02:42 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-02-14 14:02:42 +0100 |
| commit | 241843492d2ac60ec52dbea1e8b2459c3a17106a (patch) | |
| tree | f07a8ea5ac82299a1b5471ce0005b6db7df86e28 /erts | |
| parent | 6e396e67664be90a13c3119a0c766019dd889845 (diff) | |
| parent | 4174e678388d4a829fef7a2102fc5b19e5df888f (diff) | |
| download | otp-241843492d2ac60ec52dbea1e8b2459c3a17106a.tar.gz otp-241843492d2ac60ec52dbea1e8b2459c3a17106a.tar.bz2 otp-241843492d2ac60ec52dbea1e8b2459c3a17106a.zip | |
Merge branch 'bjorn/fix-make_stub-leak' into dev
* bjorn/fix-make_stub-leak:
Eliminate memory leak in code:make_stub/1
Test more error cases for code:make_stub/1
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/beam_load.c | 14 | ||||
| -rw-r--r-- | erts/emulator/test/code_SUITE.erl | 5 |
2 files changed, 17 insertions, 2 deletions
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c index e6448931eb..4e0d19dafa 100644 --- a/erts/emulator/beam/beam_load.c +++ b/erts/emulator/beam/beam_load.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 1996-2010. All Rights Reserved. + * Copyright Ericsson AB 1996-2011. All Rights Reserved. * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in @@ -5476,6 +5476,9 @@ erts_make_stub_module(Process* p, Eterm Mod, Eterm Beam, Eterm Info) if (state.lambdas != state.def_lambdas) { erts_free(ERTS_ALC_T_LOADER_TMP, (void *) state.lambdas); } + erts_free(ERTS_ALC_T_LOADER_TMP, (void *) state.labels); + erts_free(ERTS_ALC_T_LOADER_TMP, (void *) state.atom); + erts_free(ERTS_ALC_T_LOADER_TMP, (void *) state.export); if (bin != NULL) { driver_free_binary(bin); } @@ -5487,9 +5490,18 @@ erts_make_stub_module(Process* p, Eterm Mod, Eterm Beam, Eterm Info) if (code != NULL) { erts_free(ERTS_ALC_T_CODE, code); } + if (state.labels != NULL) { + erts_free(ERTS_ALC_T_LOADER_TMP, (void *) state.labels); + } if (state.lambdas != state.def_lambdas) { erts_free(ERTS_ALC_T_LOADER_TMP, (void *) state.lambdas); } + if (state.atom != NULL) { + erts_free(ERTS_ALC_T_LOADER_TMP, (void *) state.atom); + } + if (state.export != NULL) { + erts_free(ERTS_ALC_T_LOADER_TMP, (void *) state.export); + } if (bin != NULL) { driver_free_binary(bin); } diff --git a/erts/emulator/test/code_SUITE.erl b/erts/emulator/test/code_SUITE.erl index 33351a3cc9..5707de30d3 100644 --- a/erts/emulator/test/code_SUITE.erl +++ b/erts/emulator/test/code_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2009. All Rights Reserved. +%% Copyright Ericsson AB 1999-2011. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -320,6 +320,9 @@ make_stub(Config) when is_list(Config) -> (catch code:make_stub_module(my_code_test, bit_sized_binary(Code), {[],[]})), + ?line {'EXIT',{badarg,_}} = + (catch code:make_stub_module(my_code_test_with_wrong_name, + Code, {[],[]})), ok. make_stub_many_funs(Config) when is_list(Config) -> |