diff options
| author | Jonathan Rose <jrose@digium.com> | 2013-10-24 17:00:27 +0000 |
|---|---|---|
| committer | Jonathan Rose <jrose@digium.com> | 2013-10-24 17:00:27 +0000 |
| commit | 4ca0f222e85554e24d5cfb7d48b3a774d96a6e45 (patch) | |
| tree | 411b1a8a88241acde89163243e464edce21486d4 /main/data.c | |
| parent | beb5cdbef54908cc1564539f9cfb8852b530f2bc (diff) | |
memory leaks: Memory leak cleanup patch by Corey Farrell (second set)
Also covers ast_app_parse_timelen-fail-zero-length.patch, but the patch was
replaced with one of my own.
(issue ASTERISK-22467)
Reported by: Corey Farrell
Patches:
chan_dahdi-cleanup_push.patch uploaded by coreyfarrell (license 5909)
clicompat-r2.patch uploaded by coreyfarrell (license 5909)
codecs-ilbc-doCPLC.patch uploaded by coreyfarrell (license 5909)
data-cleanup-test-registration.patch uploaded by coreyfarrell (license 5909)
main-asterisk-kill-listener.patch uploaded by coreyfarrell (license 5909)
........
Merged revisions 401704 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 401705 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 401706 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@401707 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/data.c')
| -rw-r--r-- | main/data.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/main/data.c b/main/data.c index 73a336613..af4abd902 100644 --- a/main/data.c +++ b/main/data.c @@ -3313,6 +3313,7 @@ static void data_shutdown(void) ao2_t_ref(root_data.container, -1, "Unref root_data.container in data_shutdown"); root_data.container = NULL; ast_rwlock_destroy(&root_data.lock); + AST_TEST_UNREGISTER(test_data_get); } int ast_data_init(void) @@ -3330,9 +3331,7 @@ int ast_data_init(void) res |= ast_manager_register_xml_core("DataGet", 0, manager_data_get); -#ifdef TEST_FRAMEWORK AST_TEST_REGISTER(test_data_get); -#endif ast_register_atexit(data_shutdown); |