[asterisk-commits] rmudgett: trunk r397978 - in /trunk: ./ main/pbx.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu Aug 29 20:20:05 2013
New Revision: 397978

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=397978
Log:
pbx.c: Make pbx_substitute_variables_helper_full() not mask variables.
........

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

Modified:
    trunk/   (props changed)
    trunk/main/pbx.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Thu Aug 29 20:20:05 2013
@@ -1,1 +1,1 @@
-/branches/12:1-397927,397938,397945-397946,397955,397958,397960,397968
+/branches/12:1-397927,397938,397945-397946,397955,397958,397960,397968,397977

Modified: trunk/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/pbx.c?view=diff&rev=397978&r1=397977&r2=397978
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Thu Aug 29 20:20:05 2013
@@ -4479,11 +4479,12 @@
 
 			/* Substitute if necessary */
 			if (needsub) {
-				size_t used;
-				if (!ltmp)
+				size_t my_used;
+
+				if (!ltmp) {
 					ltmp = ast_alloca(VAR_BUF_SIZE);
-
-				pbx_substitute_variables_helper_full(c, headp, var, ltmp, VAR_BUF_SIZE - 1, &used);
+				}
+				pbx_substitute_variables_helper_full(c, headp, var, ltmp, VAR_BUF_SIZE - 1, &my_used);
 				vars = ltmp;
 			} else {
 				vars = var;
@@ -4568,11 +4569,12 @@
 
 			/* Substitute if necessary */
 			if (needsub) {
-				size_t used;
-				if (!ltmp)
+				size_t my_used;
+
+				if (!ltmp) {
 					ltmp = ast_alloca(VAR_BUF_SIZE);
-
-				pbx_substitute_variables_helper_full(c, headp, var, ltmp, VAR_BUF_SIZE - 1, &used);
+				}
+				pbx_substitute_variables_helper_full(c, headp, var, ltmp, VAR_BUF_SIZE - 1, &my_used);
 				vars = ltmp;
 			} else {
 				vars = var;