diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-01 21:21:54 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-01 21:21:54 +0000 |
| commit | 4879a39a9aec28f8b9c427cf473fccfd071c9bf5 (patch) | |
| tree | a5c2b159a33800c2f0f17e0e0ed153a8fc15b5b7 | |
| parent | 8f4b2be484ab96d23a2de292524ed2dd869a8d00 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@231876 f38db490-d61c-443f-a65b-d21fe96a405b
| -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 628781176..be1cb5355 100644 --- 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) |