From: Richard Mudgett <rmudgett@digium.com>
Date: Fri, 30 Aug 2013 01:20:05 +0000 (+0000)
Subject: pbx.c: Make pbx_substitute_variables_helper_full() not mask variables.
X-Git-Tag: 13.0.0-beta1~1153
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bac9a478ebd2c86773608749eb04d0ddad1b1911;p=thirdparty%2Fasterisk.git

pbx.c: Make pbx_substitute_variables_helper_full() not mask variables.
........

Merged revisions 397977 from http://svn.asterisk.org/svn/asterisk/branches/12


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

diff --git a/main/pbx.c b/main/pbx.c
index fa2f645947..09f3d95ec7 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -4479,11 +4479,12 @@ void pbx_substitute_variables_helper_full(struct ast_channel *c, struct varshead
 
 			/* Substitute if necessary */
 			if (needsub) {
-				size_t used;
-				if (!ltmp)
-					ltmp = ast_alloca(VAR_BUF_SIZE);
+				size_t my_used;
 
-				pbx_substitute_variables_helper_full(c, headp, var, ltmp, VAR_BUF_SIZE - 1, &used);
+				if (!ltmp) {
+					ltmp = ast_alloca(VAR_BUF_SIZE);
+				}
+				pbx_substitute_variables_helper_full(c, headp, var, ltmp, VAR_BUF_SIZE - 1, &my_used);
 				vars = ltmp;
 			} else {
 				vars = var;
@@ -4568,11 +4569,12 @@ void pbx_substitute_variables_helper_full(struct ast_channel *c, struct varshead
 
 			/* Substitute if necessary */
 			if (needsub) {
-				size_t used;
-				if (!ltmp)
-					ltmp = ast_alloca(VAR_BUF_SIZE);
+				size_t my_used;
 
-				pbx_substitute_variables_helper_full(c, headp, var, ltmp, VAR_BUF_SIZE - 1, &used);
+				if (!ltmp) {
+					ltmp = ast_alloca(VAR_BUF_SIZE);
+				}
+				pbx_substitute_variables_helper_full(c, headp, var, ltmp, VAR_BUF_SIZE - 1, &my_used);
 				vars = ltmp;
 			} else {
 				vars = var;