kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-10 20:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

utils: Fix memory leaks and missed unregistration of CLI commands on shutdown

Browse Source 
Final set of patches in a series of memory leak/cleanup patches by Corey Farrell

(closes issue ASTERISK-22467)
Reported by: Corey Farrell
Patches:
    main-utils-1.8.patch uploaded by coreyfarrell (license 5909)
    main-utils-11.patch uploaded by coreyfarrell (license 5909)
    main-utils-12up.patch uploaded by coreyfarrell (license 5909)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@401829 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jonathan Rose
2013-10-24 20:32:37 +00:00
parent 240f7e9e73
commit f313081314
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
main/utils.c
View File

@@ -1007,9 +1007,6 @@ static char *handle_show_locks(struct ast_cli_entry *e, int cmd, struct ast_cli_
struct thr_lock_info *lock_info; struct thr_lock_info *lock_info;
struct ast_str *str; struct ast_str *str;
if (!(str = ast_str_create(4096)))
return CLI_FAILURE;
switch (cmd) { switch (cmd) {
case CLI_INIT: case CLI_INIT:
e->command = "core show locks"; e->command = "core show locks";
@@ -1023,6 +1020,9 @@ static char *handle_show_locks(struct ast_cli_entry *e, int cmd, struct ast_cli_
return NULL; return NULL;
} }
if (!(str = ast_str_create(4096)))
return CLI_FAILURE;
ast_str_append(&str, 0, "\n" ast_str_append(&str, 0, "\n"
"=======================================================================\n" "=======================================================================\n"
"=== %s\n" "=== %s\n"
@@ -2116,6 +2116,13 @@ int ast_mkdir(const char *path, int mode)
return 0; return 0;
} }
#if defined(DEBUG_THREADS) && !defined(LOW_MEMORY)
static void utils_shutdown(void)
{
ast_cli_unregister_multiple(utils_cli, ARRAY_LEN(utils_cli));
}
#endif
int ast_utils_init(void) int ast_utils_init(void)
{ {
#ifdef HAVE_DEV_URANDOM #ifdef HAVE_DEV_URANDOM
@@ -2125,6 +2132,7 @@ int ast_utils_init(void)
#ifdef DEBUG_THREADS #ifdef DEBUG_THREADS
#if !defined(LOW_MEMORY) #if !defined(LOW_MEMORY)
ast_cli_register_multiple(utils_cli, ARRAY_LEN(utils_cli)); ast_cli_register_multiple(utils_cli, ARRAY_LEN(utils_cli));
ast_register_atexit(utils_shutdown);
#endif #endif
#endif #endif
return 0; return 0;