[Freeswitch-svn] [commit] r9237 - freeswitch/trunk/src/mod/applications/mod_conference

[Freeswitch SVN]

Author: anthm
Date: Mon Aug 11 12:11:50 2008
New Revision: 9237

Modified:
   freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c

Log:
extra blank-string protection

Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c	Mon Aug 11 12:11:50 2008
@@ -2384,7 +2384,9 @@
 		expanded = NULL;
 	}
 	if (!strncasecmp(file, "say:", 4)) {
-		status = conference_member_say(member, file + 4, leadin);
+		if (!switch_strlen_zero(file + 4)) {
+			status = conference_member_say(member, file + 4, leadin);
+		}
 		goto done;
 	}
 	if (!switch_is_file_path(file)) {
@@ -2393,7 +2395,7 @@
 				goto done;
 			}
 			file = dfile;
-		} else {
+		} else if (!switch_strlen_zero(file)) {
 			status = conference_member_say(member, file, leadin);
 			goto done;
 		}
@@ -2721,7 +2723,7 @@
 		return SWITCH_STATUS_GENERR;
 
 	switch_clear_flag_locked(member, MFLAG_CAN_SPEAK);
-	if (member->conference->muted_sound) {
+	if (!switch_strlen_zero(member->conference->muted_sound)) {
 		conference_member_play_file(member, member->conference->muted_sound, 0);
 	} else {
 		char msg[512];
@@ -2753,7 +2755,7 @@
 	if (stream != NULL) {
 		stream->write_function(stream, "OK unmute %u\n", member->id);
 	}
-	if (member->conference->unmuted_sound) {
+	if (!switch_strlen_zero(member->conference->unmuted_sound)) {
 		conference_member_play_file(member, member->conference->unmuted_sound, 0);
 	} else {
 		char msg[512];