Merged revisions 89205 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89205 | mmichelson | 2007-11-12 18:56:46 -0600 (Mon, 12 Nov 2007) | 5 lines

Some sanity checking for MixMonitor. If only 1 argument is given, then the args.options
and args.post_process strings are uninitialized and could contain garbage. This change
handles this situation properly by only using arguments that we have parsed.

........

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

diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c
index 1583566..020386a 100644 (file)
--- a/apps/app_mixmonitor.c
+++ b/apps/app_mixmonitor.c
@@ -309,7 +309,7 @@ static int mixmonitor_exec(struct ast_channel *chan, void *data)
                return -1;
        }
 
-       if (args.options) {
+       if (args.argc > 1 && args.options) {
                char *opts[OPT_ARG_ARRAY_SIZE] = { NULL, };
 
                ast_app_parse_options(mixmonitor_opts, &flags, opts, args.options);
@@ -360,7 +360,7 @@ static int mixmonitor_exec(struct ast_channel *chan, void *data)
        ast_mkdir(tmp, 0777);
 
        pbx_builtin_setvar_helper(chan, "MIXMONITOR_FILENAME", args.filename);
-       launch_monitor_thread(chan, args.filename, flags.flags, readvol, writevol, args.post_process);
+       launch_monitor_thread(chan, args.filename, flags.flags, readvol, writevol, args.argc > 2 ? args.post_process : "");
 
        return 0;
 }