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

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Aug 28 11:13:18 2013
New Revision: 397860

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

Merged revisions 397859 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 Wed Aug 28 11:13:18 2013
@@ -1,1 +1,1 @@
-/branches/12:1-397816,397854,397856
+/branches/12:1-397816,397854,397856,397859

Modified: trunk/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/pbx.c?view=diff&rev=397860&r1=397859&r2=397860
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Wed Aug 28 11:13:18 2013
@@ -4284,12 +4284,12 @@
 
 			/* Substitute if necessary */
 			if (needsub) {
-				size_t used;
+				size_t my_used;
+
 				if (!substr2) {
 					substr2 = ast_str_create(16);
 				}
-
-				ast_str_substitute_variables_full(&substr2, 0, c, headp, ast_str_buffer(substr1), &used);
+				ast_str_substitute_variables_full(&substr2, 0, c, headp, ast_str_buffer(substr1), &my_used);
 				finalvars = ast_str_buffer(substr2);
 			} else {
 				finalvars = ast_str_buffer(substr1);
@@ -4360,12 +4360,12 @@
 
 			/* Substitute if necessary */
 			if (needsub) {
-				size_t used;
+				size_t my_used;
+
 				if (!substr2) {
 					substr2 = ast_str_create(16);
 				}
-
-				ast_str_substitute_variables_full(&substr2, 0, c, headp, ast_str_buffer(substr1), &used);
+				ast_str_substitute_variables_full(&substr2, 0, c, headp, ast_str_buffer(substr1), &my_used);
 				finalvars = ast_str_buffer(substr2);
 			} else {
 				finalvars = ast_str_buffer(substr1);