From 827ca978728b142a6143bf5b34d02f82a5302e57 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Sat, 8 Sep 2007 18:41:32 +0000 Subject: [PATCH] Fix a small memory leak. ast_unregister_atexit() did not free the entry it removed. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@81997 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/asterisk.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/main/asterisk.c b/main/asterisk.c index df4b55b727..19d4237f30 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -699,22 +699,26 @@ static char *complete_show_version_files(const char *line, const char *word, int int ast_register_atexit(void (*func)(void)) { - int res = -1; struct ast_atexit *ae; + + if (!(ae = ast_calloc(1, sizeof(*ae)))) + return -1; + + ae->func = func; + ast_unregister_atexit(func); + AST_LIST_LOCK(&atexits); - if ((ae = ast_calloc(1, sizeof(*ae)))) { - AST_LIST_INSERT_HEAD(&atexits, ae, list); - ae->func = func; - res = 0; - } + AST_LIST_INSERT_HEAD(&atexits, ae, list); AST_LIST_UNLOCK(&atexits); - return res; + + return 0; } void ast_unregister_atexit(void (*func)(void)) { - struct ast_atexit *ae; + struct ast_atexit *ae = NULL; + AST_LIST_LOCK(&atexits); AST_LIST_TRAVERSE_SAFE_BEGIN(&atexits, ae, list) { if (ae->func == func) { @@ -724,6 +728,9 @@ void ast_unregister_atexit(void (*func)(void)) } AST_LIST_TRAVERSE_SAFE_END AST_LIST_UNLOCK(&atexits); + + if (ae) + free(ae); } static int fdprint(int fd, const char *s)