aboutsummaryrefslogtreecommitdiffstats
path: root/main/asterisk.c
diff options
context:
space:
mode:
authordvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-06-18 16:58:03 +0000
committerdvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-06-18 16:58:03 +0000
commit0740578e6df8e4cb4cb49a2550f5946ceaf0e509 (patch)
tree2bbf3d469c8e0fd61393b6e8d9c2abcfac0107ce /main/asterisk.c
parentc6e74d7f36371d508de5ec7ebcd838913c75ce1c (diff)
Merged revisions 201678 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r201678 | dvossel | 2009-06-18 11:37:42 -0500 (Thu, 18 Jun 2009) | 11 lines fixes some memory leaks and redundant conditions (closes issue #15269) Reported by: contactmayankjain Patches: patch.txt uploaded by contactmayankjain (license 740) memory_leak_stuff.trunk.diff uploaded by dvossel (license 671) Tested by: contactmayankjain, dvossel ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@201682 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/asterisk.c')
-rw-r--r--main/asterisk.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/main/asterisk.c b/main/asterisk.c
index b86587d33..95190e2cf 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -799,8 +799,7 @@ void ast_unregister_atexit(void (*func)(void))
AST_RWLIST_TRAVERSE_SAFE_END;
AST_RWLIST_UNLOCK(&atexits);
- if (ae)
- free(ae);
+ free(ae);
}
/* Sending commands from consoles back to the daemon requires a terminating NULL */