WaitExten m option with no parameters generates frame with zero datalen but non-null...

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 9f4c63fd70aa3fee5875d8b19fd92c7040ecafd6..85a3e3efe716062145a6ac5dc82779f16c0f4e2c 100644 (file)
--- 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)