diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-08-28 16:13:18 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-08-28 16:13:18 +0000 |
| commit | b252c11affaf51d941c3e50403145241a9e31f2e (patch) | |
| tree | acbb37e63d5353946337631499c2c57005e610c3 /main/pbx.c | |
| parent | c7b7d98a37cf85d62b6ab1961808db47163dff51 (diff) | |
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
Diffstat (limited to 'main/pbx.c')
| -rw-r--r-- | main/pbx.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/main/pbx.c b/main/pbx.c index 0b970bb13..fa2f64594 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -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); |