[svn-commits] dvossel: branch 1.4 r231853 - /branches/1.4/main/pbx.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Tue Dec  1 15:14:31 2009
New Revision: 231853

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=231853
Log:
WaitExten m option with no parameters generates frame with zero datalen but non-null data ptr


Modified:
    branches/1.4/main/pbx.c

Modified: branches/1.4/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/main/pbx.c?view=diff&rev=231853&r1=231852&r2=231853
==============================================================================
--- branches/1.4/main/pbx.c (original)
+++ branches/1.4/main/pbx.c Tue Dec  1 15:14:31 2009
@@ -5650,7 +5650,7 @@
 	if (ast_test_flag(&flags, WAITEXTEN_MOH) && !opts[0] ) {
 		ast_log(LOG_WARNING, "The 'm' option has been specified for WaitExten without a class.\n"); 
 	} else if (ast_test_flag(&flags, WAITEXTEN_MOH))
-		ast_indicate_data(chan, AST_CONTROL_HOLD, opts[0], strlen(opts[0]));
+		ast_indicate_data(chan, AST_CONTROL_HOLD, S_OR(opts[0], NULL), strlen(opts[0]));
 
 	/* Wait for "n" seconds */
 	if (args.timeout && (sec = atof(args.timeout)) > 0.0)