kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-18 15:49:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a small memory leak. ast_unregister_atexit() did not free the entry it removed.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@81997 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-09-08 18:41:32 +00:00
parent fab2578b02
commit 827ca97872
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
main/asterisk.c
View File

@@ -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 ast_register_atexit(void (*func)(void))
{ {
int res = -1;
struct ast_atexit *ae; struct ast_atexit *ae;
if (!(ae = ast_calloc(1, sizeof(*ae))))
return -1;
ae->func = func;
ast_unregister_atexit(func); ast_unregister_atexit(func);
AST_LIST_LOCK(&atexits); AST_LIST_LOCK(&atexits);
if ((ae = ast_calloc(1, sizeof(*ae)))) { AST_LIST_INSERT_HEAD(&atexits, ae, list);
AST_LIST_INSERT_HEAD(&atexits, ae, list);
ae->func = func;
res = 0;
}
AST_LIST_UNLOCK(&atexits); AST_LIST_UNLOCK(&atexits);
return res;
return 0;
} }
void ast_unregister_atexit(void (*func)(void)) void ast_unregister_atexit(void (*func)(void))
{ {
struct ast_atexit *ae; struct ast_atexit *ae = NULL;
AST_LIST_LOCK(&atexits); AST_LIST_LOCK(&atexits);
AST_LIST_TRAVERSE_SAFE_BEGIN(&atexits, ae, list) { AST_LIST_TRAVERSE_SAFE_BEGIN(&atexits, ae, list) {
if (ae->func == func) { if (ae->func == func) {
@@ -724,6 +728,9 @@ void ast_unregister_atexit(void (*func)(void))
} }
AST_LIST_TRAVERSE_SAFE_END AST_LIST_TRAVERSE_SAFE_END
AST_LIST_UNLOCK(&atexits); AST_LIST_UNLOCK(&atexits);
if (ae)
free(ae);
} }
static int fdprint(int fd, const char *s) static int fdprint(int fd, const char *s)