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

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

diff --git a/main/utils.c b/main/utils.c
index cb692cafa91f26306c9c6b39eae9760d45cc2fcd..29ca746f37771acc20a6962a1360f688dab05b34 100644 (file)
--- a/main/utils.c
+++ b/main/utils.c
@@ -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 ast_str *str;
 
-       if (!(str = ast_str_create(4096)))
-               return CLI_FAILURE;
-
        switch (cmd) {
        case CLI_INIT:
                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;
        }
 
+       if (!(str = ast_str_create(4096)))
+               return CLI_FAILURE;
+
        ast_str_append(&str, 0, "\n" 
                       "=======================================================================\n"
                       "=== %s\n"
@@ -2116,6 +2116,13 @@ int ast_mkdir(const char *path, int mode)
        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)
 {
 #ifdef HAVE_DEV_URANDOM
@@ -2125,6 +2132,7 @@ int ast_utils_init(void)
 #ifdef DEBUG_THREADS
 #if !defined(LOW_MEMORY)
        ast_cli_register_multiple(utils_cli, ARRAY_LEN(utils_cli));
+       ast_register_atexit(utils_shutdown);
 #endif
 #endif
        return 0;