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

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@397977 65c4cc65-6c06-0410-ace0-fbb531ad65f3
changes/78/78/1
Richard Mudgett 13 years ago
parent 55b3f213af
commit 8741cc7fb7

@ -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;

Loading…
Cancel
Save