summaryrefslogtreecommitdiff
path: root/main/asterisk.c
diff options
context:
space:
mode:
authorMark Michelson <mmichelson@digium.com>2008-07-14 22:22:57 +0000
committerMark Michelson <mmichelson@digium.com>2008-07-14 22:22:57 +0000
commit88718801b33ad9dc78b3b2a89a9389068a363717 (patch)
treeec42104115c138346f2da4fc681af1c66ae58952 /main/asterisk.c
parentbd1bb0d0e2b44dc86bf8ebe6ea7359b04e892ebf (diff)
Fix a memory leak in the case that /dev/null cannot be
opened when running startup commands from cli.conf (closes issue #13066) Reported by: eliel Patches: asterisk.c.patch uploaded by eliel (license 64) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@130854 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/asterisk.c')
-rw-r--r--main/asterisk.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/main/asterisk.c b/main/asterisk.c
index c836611fc..2cad4805f 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -2881,8 +2881,10 @@ static void run_startup_commands(void)
return;
fd = open("/dev/null", O_RDWR);
- if (fd < 0)
+ if (fd < 0) {
+ ast_config_destroy(cfg);
return;
+ }
for (v = ast_variable_browse(cfg, "startup_commands"); v; v = v->next) {
if (ast_true(v->value))