[asterisk-commits] oej: branch 1.8 r287471 - in /branches/1.8: ./ main/manager.c

[SVN commits to the Asterisk project]

Author: oej
Date: Sun Sep 19 11:09:28 2010
New Revision: 287471

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=287471
Log:
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:
    branches/1.8/   (props changed)
    branches/1.8/main/manager.c

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

Modified: branches/1.8/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/manager.c?view=diff&rev=287471&r1=287470&r2=287471
==============================================================================
--- branches/1.8/main/manager.c (original)
+++ branches/1.8/main/manager.c Sun Sep 19 11:09:28 2010
@@ -3820,7 +3820,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;
@@ -3871,6 +3871,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) {
@@ -3924,6 +3927,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;
 		}
 	}