From: Olle Johansson <oej@edvina.net>
Date: Sun, 19 Sep 2010 16:09:28 +0000 (+0000)
Subject: Merged revisions 287470 via svnmerge from
X-Git-Tag: 1.8.0-rc1~3^2~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9f3a7a348cd55ba444a67cfa0e583b077b54d317;p=thirdparty%2Fasterisk.git

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/
  ........
................


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

diff --git a/main/manager.c b/main/manager.c
index 97ab64c020..740dd5fc11 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -3820,7 +3820,7 @@ static int action_originate(struct mansession *s, const struct message *m)
 	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 @@ static int action_originate(struct mansession *s, const struct message *m)
 		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 @@ static int action_originate(struct mansession *s, const struct message *m)
 			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;
 		}
 	}