From 62a9f72590a44cb1ad4df4e01f04adf925e3496c Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Fri, 8 Feb 2008 19:06:13 +0000
Subject: [PATCH] extra error checking.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7559 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 src/mod/applications/mod_conference/mod_conference.c |  2 +-
 src/mod/loggers/mod_console/mod_console.c            |  2 +-
 src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c            | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index 10a3737e50..f0bd147026 100644
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -856,7 +856,7 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t * thread,
 			break;
 		}
 		switch_mutex_lock(conference->mutex);
-		ready = has_file_data = total = 0;
+		has_file_data = ready = total = 0;
 
 		/* Read one frame of audio from each member channel and save it for redistribution */
 		for (imember = conference->members; imember; imember = imember->next) {
diff --git a/src/mod/loggers/mod_console/mod_console.c b/src/mod/loggers/mod_console/mod_console.c
index e286aad40f..1b79bc7332 100644
--- a/src/mod/loggers/mod_console/mod_console.c
+++ b/src/mod/loggers/mod_console/mod_console.c
@@ -138,7 +138,7 @@ static switch_status_t config_logger(void)
 #else
 				COLORIZE = 1;
 #endif
-			} else if (!strcasecmp(var, "loglevel")) {
+			} else if (!strcasecmp(var, "loglevel") && !switch_strlen_zero(val)) {
 				hard_log_level = switch_log_str2level(val);
 			}
 		}
diff --git a/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c b/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c
index a3ec9a5c29..35a0a8e9d9 100644
--- a/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c
+++ b/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c
@@ -265,23 +265,23 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_xml_cdr_load)
 			char *var = (char *) switch_xml_attr_soft(param, "name");
 			char *val = (char *) switch_xml_attr_soft(param, "value");
 
-			if (!strcasecmp(var, "cred")) {
+			if (!strcasecmp(var, "cred") && !switch_strlen_zero(val)) {
 				globals.cred = strdup(val);
-			} else if (!strcasecmp(var, "url")) {
+			} else if (!strcasecmp(var, "url") && !switch_strlen_zero(val)) {
 				globals.url = strdup(val);
-			} else if (!strcasecmp(var, "delay")) {
+			} else if (!strcasecmp(var, "delay") && !switch_strlen_zero(val)) {
 				globals.delay = (uint32_t) atoi(val);
 			} else if (!strcasecmp(var, "log-b-leg")) {
 				globals.log_b = switch_true(val);
 			} else if (!strcasecmp(var, "disable-100-continue") && switch_true(val)) {
 				globals.disable100continue = 1;
-			} else if (!strcasecmp(var, "encode")) {
+			} else if (!strcasecmp(var, "encode") && !switch_strlen_zero(val)) {
 				if (!strcasecmp(val, "base64")) {
 					globals.encode = 2;
 				} else {
 					globals.encode = switch_true(val) ? 1 : 0;
 				}
-			} else if (!strcasecmp(var, "retries")) {
+			} else if (!strcasecmp(var, "retries") && !switch_strlen_zero(val)) {
 				globals.retries = (uint32_t) atoi(val);
 			} else if (!strcasecmp(var, "log-dir")) {
 				if (switch_strlen_zero(val)) {