[asterisk-commits] oej: branch 1.4 r287469 - /branches/1.4/main/manager.c

[SVN commits to the Asterisk project]

Author: oej
Date: Sun Sep 19 10:56:50 2010
New Revision: 287469

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=287469
Log:
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.4/main/manager.c

Modified: branches/1.4/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/main/manager.c?view=diff&rev=287469&r1=287468&r2=287469
==============================================================================
--- branches/1.4/main/manager.c (original)
+++ branches/1.4/main/manager.c Sun Sep 19 10:56:50 2010
@@ -1961,7 +1961,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;
@@ -2011,6 +2011,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) {
@@ -2050,6 +2053,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;
 		}
 	}