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

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

diff --git a/main/pbx.c b/main/pbx.c
index 6287811767fd40c66be52b65a0572ffd5bd7887b..be1cb5355f0b9e29d5a314b8165f8121c47a8ce5 100644 (file)
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -8170,7 +8170,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]));
        } else if (ast_test_flag(&flags, WAITEXTEN_DIALTONE)) {
                const struct tone_zone_sound *ts = ast_get_indication_tone(chan->zone, "dial");
                if (ts)