[asterisk-commits] dvossel: branch dvossel/slin_playback r327109 - in /team/dvossel/slin_playbac...

[SVN commits to the Asterisk project]

Author: dvossel
Date: Fri Jul  8 15:08:56 2011
New Revision: 327109

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=327109
Log:
merge update

Modified:
    team/dvossel/slin_playback/   (props changed)
    team/dvossel/slin_playback/main/pbx.c
    team/dvossel/slin_playback/tests/test_substitution.c

Propchange: team/dvossel/slin_playback/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Propchange: team/dvossel/slin_playback/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jul  8 15:08:56 2011
@@ -1,1 +1,1 @@
-/trunk:1-327102
+/trunk:1-327108

Modified: team/dvossel/slin_playback/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/slin_playback/main/pbx.c?view=diff&rev=327109&r1=327108&r2=327109
==============================================================================
--- team/dvossel/slin_playback/main/pbx.c (original)
+++ team/dvossel/slin_playback/main/pbx.c Fri Jul  8 15:08:56 2011
@@ -3663,9 +3663,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: team/dvossel/slin_playback/tests/test_substitution.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/slin_playback/tests/test_substitution.c?view=diff&rev=327109&r1=327108&r2=327109
==============================================================================
--- team/dvossel/slin_playback/tests/test_substitution.c (original)
+++ team/dvossel/slin_playback/tests/test_substitution.c Fri Jul  8 15:08:56 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 */