[asterisk-commits] seanbright: branch 1.6.1 r212766 - in /branches/1.6.1: ./ main/manager.c

[SVN commits to the Asterisk project]

Author: seanbright
Date: Tue Aug 18 11:41:15 2009
New Revision: 212766

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=212766
Log:
Merged revisions 212764 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r212764 | seanbright | 2009-08-18 12:38:36 -0400 (Tue, 18 Aug 2009) | 18 lines
  
  Merged revisions 212763 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r212763 | seanbright | 2009-08-18 12:36:00 -0400 (Tue, 18 Aug 2009) | 11 lines
    
    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
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/manager.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/manager.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/main/manager.c?view=diff&rev=212766&r1=212765&r2=212766
==============================================================================
--- branches/1.6.1/main/manager.c (original)
+++ branches/1.6.1/main/manager.c Tue Aug 18 11:41:15 2009
@@ -2236,7 +2236,7 @@
 	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)) {
@@ -2248,6 +2248,8 @@
 		astman_send_error(s, m, "Command blacklisted");
 		return 0;
 	}
+
+	fd = mkstemp(template);
 
 	astman_append(s, "Response: Follows\r\nPrivilege: Command\r\n");
 	if (!ast_strlen_zero(id))