From: David Vossel Date: Tue, 1 Dec 2009 21:14:31 +0000 (+0000) Subject: WaitExten m option with no parameters generates frame with zero datalen but non-null... X-Git-Tag: 1.4.28-rc1~11^2~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=031d3b8d1f7f24f14b81824831f0c69a7c650a07;p=thirdparty%2Fasterisk.git 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/branches/1.4@231853 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/pbx.c b/main/pbx.c index 9f4c63fd70..85a3e3efe7 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -5650,7 +5650,7 @@ static int pbx_builtin_waitexten(struct ast_channel *chan, void *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])); /* Wait for "n" seconds */ if (args.timeout && (sec = atof(args.timeout)) > 0.0)