diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-09-08 18:41:32 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-09-08 18:41:32 +0000 |
commit | d545906560041c6d093931e639fd3b9bf0d607f7 (patch) | |
tree | c838151477194da149dfdd5d714ad2bee40cd6e6 /main/asterisk.c | |
parent | 85d4846f21a504d0675285ef33f128da1d900344 (diff) |
Fix a small memory leak. ast_unregister_atexit() did not free the entry it removed.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@81997 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/asterisk.c')
-rw-r--r-- | main/asterisk.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index df4b55b72..19d4237f3 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) |