[svn-commits] dvossel: branch 1.6.1 r231876 - in /branches/1.6.1: ./ main/pbx.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Tue Dec  1 15:21:54 2009
New Revision: 231876

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=231876
Log:
Merged revisions 231867 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r231867 | dvossel | 2009-12-01 15:20:19 -0600 (Tue, 01 Dec 2009) | 9 lines
  
  Merged revisions 231853 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r231853 | dvossel | 2009-12-01 15:14:31 -0600 (Tue, 01 Dec 2009) | 3 lines
    
    WaitExten m option with no parameters generates frame with zero datalen but non-null data ptr
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/pbx.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/main/pbx.c?view=diff&rev=231876&r1=231875&r2=231876
==============================================================================
--- branches/1.6.1/main/pbx.c (original)
+++ branches/1.6.1/main/pbx.c Tue Dec  1 15:21:54 2009
@@ -8170,7 +8170,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]));
 	} else if (ast_test_flag(&flags, WAITEXTEN_DIALTONE)) {
 		const struct tone_zone_sound *ts = ast_get_indication_tone(chan->zone, "dial");
 		if (ts)