From 9dba50322dd9d9f881fc5cac694c550c281c403f Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@russellbryant.com>
Date: Sat, 8 Sep 2007 18:45:51 +0000
Subject: [PATCH] Merged revisions 81997 via svnmerge from
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
---
main/asterisk.c | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/main/asterisk.c b/main/asterisk.c
index 86d300e35c..d6ef560d6b 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -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 res = -1;
struct ast_atexit *ae;
+
+ if (!(ae = ast_calloc(1, sizeof(*ae))))
+ return -1;
+
+ ae->func = func;
+
ast_unregister_atexit(func);
+
AST_RWLIST_WRLOCK(&atexits);
- if ((ae = ast_calloc(1, sizeof(*ae)))) {
- AST_RWLIST_INSERT_HEAD(&atexits, ae, list);
- ae->func = func;
- res = 0;
- }
+ AST_RWLIST_INSERT_HEAD(&atexits, ae, list);
AST_RWLIST_UNLOCK(&atexits);
- return res;
+
+ return 0;
}
void ast_unregister_atexit(void (*func)(void))
{
- struct ast_atexit *ae;
+ struct ast_atexit *ae = NULL;
+
AST_RWLIST_WRLOCK(&atexits);
AST_RWLIST_TRAVERSE_SAFE_BEGIN(&atexits, ae, list) {
if (ae->func == func) {
@@ -696,6 +700,9 @@ void ast_unregister_atexit(void (*func)(void))
}
AST_RWLIST_TRAVERSE_SAFE_END
AST_RWLIST_UNLOCK(&atexits);
+
+ if (ae)
+ free(ae);
}
static int fdprint(int fd, const char *s)
--
GitLab