[asterisk-commits] oej: trunk r287472 - in /trunk: ./ main/manager.c

[SVN commits to the Asterisk project]

Author: oej
Date: Sun Sep 19 11:12:08 2010
New Revision: 287472

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=287472
Log:
Merged revisions 287471 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r287471 | oej | 2010-09-19 18:09:28 +0200 (Sön, 19 Sep 2010) | 21 lines
  
  Merged revisions 287470 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r287470 | oej | 2010-09-19 18:06:10 +0200 (Sön, 19 Sep 2010) | 14 lines
    
    Merged revisions 287469 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r287469 | oej | 2010-09-19 17:56:50 +0200 (Sön, 19 Sep 2010) | 7 lines
      
      Make sure we always free variables properly in manager originate.
      
      (closes issue #17891)
      reported, solved and tested by oej
      
      Review: https://reviewboard.asterisk.org/r/869/
    ........
  ................
................

Modified:
    trunk/   (props changed)
    trunk/main/manager.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/manager.c?view=diff&rev=287472&r1=287471&r2=287472
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Sun Sep 19 11:12:08 2010
@@ -3814,7 +3814,7 @@
 	const char *async = astman_get_header(m, "Async");
 	const char *id = astman_get_header(m, "ActionID");
 	const char *codecs = astman_get_header(m, "Codecs");
-	struct ast_variable *vars = astman_get_variables(m);
+	struct ast_variable *vars;
 	char *tech, *data;
 	char *l = NULL, *n = NULL;
 	int pi = 0;
@@ -3865,6 +3865,9 @@
 		format = 0;
 		ast_parse_allow_disallow(NULL, &format, codecs, 1);
 	}
+	/* Allocate requested channel variables */
+	vars = astman_get_variables(m);
+
 	if (ast_true(async)) {
 		struct fast_originate_helper *fast = ast_calloc(1, sizeof(*fast));
 		if (!fast) {
@@ -3918,6 +3921,9 @@
 			res = ast_pbx_outgoing_exten(tech, format, data, to, context, exten, pi, &reason, 1, l, n, vars, account, NULL);
 		} else {
 			astman_send_error(s, m, "Originate with 'Exten' requires 'Context' and 'Priority'");
+			if (vars) {
+				ast_variables_destroy(vars);
+			}
 			return 0;
 		}
 	}