issue #5561

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6933 f38db490-d61c-443f-a65b-d21fe96a405b

2 files changed, 8 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 063e5057c..0170490c9 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-11-01  Kevin P. Fleming  <kpfleming@digium.com>
 
+	* apps/app_mixmonitor.c (launch_monitor_thread): ast_strlen_zero can handle NULL input (issue #5561)
+	(mixmonitor_exec): same
+
 	* res/res_features.c (ast_feature_request_and_dial): ensure that channel variables are inherited from the channel placing the call (issue #5499)
 
 	* utils.c (getloadavg): change to using _BSD_SOURCE as the indicator for whether this function is present or not (issue #5549)
diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c
index d65929314..554a02c8e 100755
--- a/apps/app_mixmonitor.c
+++ b/apps/app_mixmonitor.c
@@ -272,7 +272,7 @@ static void launch_monitor_thread(struct ast_channel *chan, const char *filename
 	int len;
 
 	len = sizeof(*mixmonitor) + strlen(filename) + 1;
-	if (post_process && !ast_strlen_zero(post_process))
+	if (!ast_strlen_zero(post_process))
 		len += strlen(post_process) + 1;
 
 	if (!(mixmonitor = calloc(1, len))) {
@@ -283,7 +283,7 @@ static void launch_monitor_thread(struct ast_channel *chan, const char *filename
 	mixmonitor->chan = chan;
 	mixmonitor->filename = (char *) mixmonitor + sizeof(*mixmonitor);
 	strcpy(mixmonitor->filename, filename);
-	if (post_process && !ast_strlen_zero(post_process)) {
+	if (!ast_strlen_zero(post_process)) {
 		mixmonitor->post_process = mixmonitor->filename + strlen(filename) + 1;
 		strcpy(mixmonitor->post_process, post_process);
 	}
@@ -336,7 +336,7 @@ static int mixmonitor_exec(struct ast_channel *chan, void *data)
 		ast_parseoptions(mixmonitor_opts, &flags, opts, args.options);
 
 		if (ast_test_flag(&flags, MUXFLAG_READVOLUME)) {
-			if (!opts[0] || ast_strlen_zero(opts[0])) {
+			if (ast_strlen_zero(opts[0])) {
 				ast_log(LOG_WARNING, "No volume level was provided for the heard volume ('v') option.\n");
 			} else if ((sscanf(opts[0], "%d", &x) != 1) || (x < -4) || (x > 4)) {
 				ast_log(LOG_NOTICE, "Heard volume must be a number between -4 and 4, not '%s'\n", opts[0]);
@@ -346,7 +346,7 @@ static int mixmonitor_exec(struct ast_channel *chan, void *data)
 		}
 		
 		if (ast_test_flag(&flags, MUXFLAG_WRITEVOLUME)) {
-			if (!opts[1] || ast_strlen_zero(opts[1])) {
+			if (ast_strlen_zero(opts[1])) {
 				ast_log(LOG_WARNING, "No volume level was provided for the spoken volume ('V') option.\n");
 			} else if ((sscanf(opts[1], "%d", &x) != 1) || (x < -4) || (x > 4)) {
 				ast_log(LOG_NOTICE, "Spoken volume must be a number between -4 and 4, not '%s'\n", opts[1]);
@@ -356,7 +356,7 @@ static int mixmonitor_exec(struct ast_channel *chan, void *data)
 		}
 		
 		if (ast_test_flag(&flags, MUXFLAG_VOLUME)) {
-			if (!opts[2] || ast_strlen_zero(opts[2])) {
+			if (ast_strlen_zero(opts[2])) {
 				ast_log(LOG_WARNING, "No volume level was provided for the combined volume ('W') option.\n");
 			} else if ((sscanf(opts[2], "%d", &x) != 1) || (x < -4) || (x > 4)) {
 				ast_log(LOG_NOTICE, "Combined volume must be a number between -4 and 4, not '%s'\n", opts[2]);