From: David Vossel <dvossel@digium.com>
Date: Tue, 1 Dec 2009 21:20:19 +0000 (+0000)
Subject: Merged revisions 231853 via svnmerge from
X-Git-Tag: 11.0.0-beta1~3810
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=176c8a01857e1278d9a38200f88ab4da65993c7a;p=thirdparty%2Fasterisk.git

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
........


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

diff --git a/main/pbx.c b/main/pbx.c
index c347aeab2d..18a1a480ed 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -9055,7 +9055,7 @@ static int pbx_builtin_waitexten(struct ast_channel *chan, const char *data)
 	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)) {
 		struct ast_tone_zone_sound *ts = ast_get_indication_tone(chan->zone, "dial");
 		if (ts) {