diff options
| author | jrose <jrose@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-07-14 19:56:19 +0000 |
|---|---|---|
| committer | jrose <jrose@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-07-14 19:56:19 +0000 |
| commit | 8e91a16c45cbfb0bc8ea6fcc7426867c71c79fc7 (patch) | |
| tree | 60e87f0b2153893b69ef89cef904d76e032598bd | |
| parent | 5911bed3161fa69c67919a669d2522e7bb569fbb (diff) | |
Merged revisions 328207 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.10
................
r328207 | jrose | 2011-07-14 14:45:18 -0500 (Thu, 14 Jul 2011) | 13 lines
Merged revisions 328205 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r328205 | jrose | 2011-07-14 14:21:02 -0500 (Thu, 14 Jul 2011) | 6 lines
Monitor application arguments requirements fixed.
Monitor was requiring options in spite of no individual option on Monitor being required.
Review: https://reviewboard.asterisk.org/r/1320/
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328208 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | res/res_monitor.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/res/res_monitor.c b/res/res_monitor.c index d508da13a..86d1d1e02 100644 --- a/res/res_monitor.c +++ b/res/res_monitor.c @@ -650,12 +650,6 @@ static int start_monitor_exec(struct ast_channel *chan, const char *data) AST_APP_ARG(fname_base); AST_APP_ARG(options); ); - - /* Parse arguments. */ - if (ast_strlen_zero(data)) { - ast_log(LOG_ERROR, "Monitor requires an argument\n"); - return 0; - } parse = ast_strdupa(data); AST_STANDARD_APP_ARGS(args, parse); @@ -671,7 +665,9 @@ static int start_monitor_exec(struct ast_channel *chan, const char *data) stream_action &= ~X_REC_OUT; } - arg = strchr(args.format, ':'); + if (args.format) { + arg = strchr(args.format, ':'); + } if (arg) { *arg++ = 0; urlprefix = arg; |