From: Joshua Colp <jcolp@digium.com>
Date: Tue, 11 Dec 2007 20:06:43 +0000 (+0000)
Subject: Only look to see if options are set if some have been provided.
X-Git-Tag: 1.6.0-beta1~3^2~460
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=270bf4804e0b5e7f967bdfd3188113feab6532fe;p=thirdparty%2Fasterisk.git

Only look to see if options are set if some have been provided.
(closes issue #11505)
Reported by: Mike Anikienko


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

diff --git a/res/res_monitor.c b/res/res_monitor.c
index 94d3a60565..617b7b6fc3 100644
--- a/res/res_monitor.c
+++ b/res/res_monitor.c
@@ -458,14 +458,16 @@ static int start_monitor_exec(struct ast_channel *chan, void *data)
 	parse = ast_strdupa((char*)data);
 	AST_STANDARD_APP_ARGS(args, parse);
 
-	if (strchr(args.options, 'm'))
-		stream_action |= X_JOIN;
-	if (strchr(args.options, 'b'))
-		waitforbridge = 1;
-	if (strchr(args.options, 'i'))
-		stream_action &= ~X_REC_IN;
-	if (strchr(args.options, 'o'))
-		stream_action &= ~X_REC_OUT;
+	if (!ast_strlen_zero(args.options)) {
+		if (strchr(args.options, 'm'))
+			stream_action |= X_JOIN;
+		if (strchr(args.options, 'b'))
+			waitforbridge = 1;
+		if (strchr(args.options, 'i'))
+			stream_action &= ~X_REC_IN;
+		if (strchr(args.options, 'o'))
+			stream_action &= ~X_REC_OUT;
+	}
 
 	arg = strchr(args.format, ':');
 	if (arg) {