From: Sean Bright <sean@malleable.com>
Date: Tue, 18 Aug 2009 16:36:00 +0000 (+0000)
Subject: Delay the creation of temporary files until we have a valid manager command to handle.
X-Git-Tag: 1.4.26.2~4^2~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4d1e6120fae8ea000eed3cd328d3fff642d1b3e;p=thirdparty%2Fasterisk.git

Delay the creation of temporary files until we have a valid manager command to handle.

Without this patch, asterisk creates a temporary file before determining if the
specified command is valid.  If invalid, we weren't properly cleaning up the file.

(closes issue #15730)
Reported by: zmehmood
Patches:
      M15730.diff uploaded by junky (license 177)
Tested by: zmehmood


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@212763 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/manager.c b/main/manager.c
index a8bd1edbbd..73a66f0bd9 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -1798,7 +1798,7 @@ static int action_command(struct mansession *s, const struct message *m)
 	const char *id = astman_get_header(m, "ActionID");
 	char *buf, *final_buf;
 	char template[] = "/tmp/ast-ami-XXXXXX";	/* template for temporary file */
-	int fd = mkstemp(template);
+	int fd;
 	off_t l;
 
 	if (ast_strlen_zero(cmd)) {
@@ -1811,6 +1811,8 @@ static int action_command(struct mansession *s, const struct message *m)
 		return 0;
 	}
 
+	fd = mkstemp(template);
+
 	astman_append(s, "Response: Follows\r\nPrivilege: Command\r\n");
 	if (!ast_strlen_zero(id))
 		astman_append(s, "ActionID: %s\r\n", id);