From 8aa9f1881a96e726515abd23867af86fd01cebe2 Mon Sep 17 00:00:00 2001 From: Olle Johansson Date: Sun, 19 Sep 2010 15:56:50 +0000 Subject: [PATCH] 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.4@287469 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/manager.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/main/manager.c b/main/manager.c index fb4c8139e3..a43a78af60 100644 --- a/main/manager.c +++ b/main/manager.c @@ -1961,7 +1961,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; @@ -2011,6 +2011,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) { @@ -2050,6 +2053,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; } } -- 2.47.2