aboutsummaryrefslogtreecommitdiffstats
path: root/main/pbx.c
diff options
context:
space:
mode:
authordvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-12-01 21:14:31 +0000
committerdvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-12-01 21:14:31 +0000
commit29c20ce9986a2ef21f2a27a4af35b151f4adcb8b (patch)
tree4a66d4c3d3900e8bdc0778a9286d398b44d9dcff /main/pbx.c
parentc242ae2b6564ccd5182714f4103459c69fdbe648 (diff)
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.4@231853 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/pbx.c')
-rw-r--r--main/pbx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/pbx.c b/main/pbx.c
index 9f4c63fd7..85a3e3efe 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)