From 9766aed39573924cf5f78c4d26e9cb37cfed9417 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Mon, 14 Jul 2008 22:24:01 +0000 Subject: [PATCH] Merged revisions 130854 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r130854 | mmichelson | 2008-07-14 17:22:57 -0500 (Mon, 14 Jul 2008) | 9 lines 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/branches/1.6.0@130855 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/asterisk.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/main/asterisk.c b/main/asterisk.c index 2080f207d8..80102120f2 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -2845,8 +2845,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))