[asterisk-commits] mnicholson: branch 1.8 r327106 - in /branches/1.8: main/ tests/

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Fri Jul  8 14:52:51 2011
New Revision: 327106

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=327106
Log:
Reset our ast_str before passing it on to dialplan function backends.

It is possible for a dialplan backend to not modify the given buffer or ast_str
and still return success. This causes any previous value stored in the buffer
to be used as if the new function call provided it. Some functions also append
to the given buffer assuming it is empty.

The test_substitution unit test has also been modified to detect this problem.

(closes issue ASTERISK-17878)

Modified:
    branches/1.8/main/pbx.c
    branches/1.8/tests/test_substitution.c

Modified: branches/1.8/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/pbx.c?view=diff&rev=327106&r1=327105&r2=327106
==============================================================================
--- branches/1.8/main/pbx.c (original)
+++ branches/1.8/main/pbx.c Fri Jul  8 14:52:51 2011
@@ -3551,9 +3551,9 @@
 		if (acfptr->mod) {
 			u = __ast_module_user_add(acfptr->mod, chan);
 		}
+		ast_str_reset(*str);
 		if (acfptr->read2) {
 			/* ast_str enabled */
-			ast_str_reset(*str);
 			res = acfptr->read2(chan, copy, args, str, maxlen);
 		} else {
 			/* Legacy function pointer, allocate buffer for result */

Modified: branches/1.8/tests/test_substitution.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/tests/test_substitution.c?view=diff&rev=327106&r1=327105&r2=327106
==============================================================================
--- branches/1.8/tests/test_substitution.c (original)
+++ branches/1.8/tests/test_substitution.c Fri Jul  8 14:52:51 2011
@@ -261,6 +261,8 @@
 	TEST(test_expected_result(test, c, "A${${baz}o:-2:-1}A", "A2A"));
 	pbx_builtin_setvar_helper(c, "list1", "ab&cd&ef");
 	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"));
 #undef TEST
 
 	/* For testing dialplan functions */