kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-26 14:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 81997 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r81997 | russell | 2007-09-08 13:41:32 -0500 (Sat, 08 Sep 2007) | 2 lines

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

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81998 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-09-08 18:45:51 +00:00
parent 382a40f04e
commit 9dba50322d
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
main/asterisk.c
View File

@@ -671,22 +671,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;
ast_unregister_atexit(func);
AST_RWLIST_WRLOCK(&atexits); if (!(ae = ast_calloc(1, sizeof(*ae))))
if ((ae = ast_calloc(1, sizeof(*ae)))) { return -1;
AST_RWLIST_INSERT_HEAD(&atexits, ae, list);
ae->func = func; ae->func = func;
res = 0;
} ast_unregister_atexit(func);
AST_RWLIST_WRLOCK(&atexits);
AST_RWLIST_INSERT_HEAD(&atexits, ae, list);
AST_RWLIST_UNLOCK(&atexits); AST_RWLIST_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_RWLIST_WRLOCK(&atexits); AST_RWLIST_WRLOCK(&atexits);
AST_RWLIST_TRAVERSE_SAFE_BEGIN(&atexits, ae, list) { AST_RWLIST_TRAVERSE_SAFE_BEGIN(&atexits, ae, list) {
if (ae->func == func) { if (ae->func == func) {
@@ -696,6 +700,9 @@ void ast_unregister_atexit(void (*func)(void))
} }
AST_RWLIST_TRAVERSE_SAFE_END AST_RWLIST_TRAVERSE_SAFE_END
AST_RWLIST_UNLOCK(&atexits); AST_RWLIST_UNLOCK(&atexits);
if (ae)
free(ae);
} }
static int fdprint(int fd, const char *s) static int fdprint(int fd, const char *s)