sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@397860 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett 2013-08-28 16:13:18 +00:00
parent c7b7d98a37
commit b252c11aff
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
main/pbx.c
View File

@ -4284,12 +4284,12 @@ void ast_str_substitute_variables_full(struct ast_str **buf, ssize_t maxlen, str
/* 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 @@ void ast_str_substitute_variables_full(struct ast_str **buf, ssize_t maxlen, str
/* 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);