reset our buffer each iteration when doing variable substitution

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@327512 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/pbx.c b/main/pbx.c
index 8c6da1f7cca6850782518f57f1de0e132490becb..869d678656486075b6531ab61953d8ab11ff3c24 100644 (file)
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -3620,6 +3620,9 @@ void ast_str_substitute_variables_full(struct ast_str **buf, ssize_t maxlen, str
        ast_str_reset(*buf);
        whereweare = tmp = templ;
        while (!ast_strlen_zero(whereweare)) {
+               /* reset our buffer */
+               ast_str_reset(substr3);
+
                /* Assume we're copying the whole remaining string */
                pos = strlen(whereweare);
                nextvar = NULL;

diff --git a/tests/test_substitution.c b/tests/test_substitution.c
index 98e1ed1911611c9c1820de22170316ec7a589397..366b9371cc3df4bf32f5b93920acd1472c1e32fb 100644 (file)
--- a/tests/test_substitution.c
+++ b/tests/test_substitution.c
@@ -263,6 +263,7 @@ AST_TEST_DEFINE(test_substitution)
        TEST(test_expected_result(test, c, "${LISTFILTER(list1,&,cd)}", "ab&ef"));
        TEST(test_expected_result(test, c, "${SHELL(echo -n 123)},${SHELL(echo -n 456)}", "123,456"));
        TEST(test_expected_result(test, c, "${foo},${CDR(answer)},${SHELL(echo -n 456)}", "123,,456"));
+       TEST(test_expected_result(test, c, "${foo},${this_does_not_exist},${THIS_DOES_NOT_EXIST(either)}", "123,,"));
 #undef TEST
 
        /* For testing dialplan functions */