diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-01 21:20:19 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-01 21:20:19 +0000 |
| commit | 574839b949a96d4914cccebd5ae50ca1ce569738 (patch) | |
| tree | 1369838d6c147a5288bf7da2cca0e00cee5e542a /main/pbx.c | |
| parent | f4d89e410ae1f1df4247b72ed19a97222113e8e7 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@231867 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/pbx.c')
| -rw-r--r-- | main/pbx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/pbx.c b/main/pbx.c index c347aeab2..18a1a480e 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) { |