mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-04 20:04:50 +00:00
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
This commit is contained in:
@@ -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)
|
||||
|
Reference in New Issue
Block a user