kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-07-28 04:35:15 +00:00
Code Issues Projects Releases Wiki Activity

extra blank-string protection

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9237 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-08-11 16:11:50 +00:00
parent 2f405f4bc5
commit 4a278c111d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mod/applications/mod_conference/mod_conference.c
View File

@ -2384,7 +2384,9 @@ static switch_status_t conference_member_play_file(conference_member_t *member,
expanded = NULL; expanded = NULL;
} }
if (!strncasecmp(file, "say:", 4)) { if (!strncasecmp(file, "say:", 4)) {
if (!switch_strlen_zero(file + 4)) {
status = conference_member_say(member, file + 4, leadin); status = conference_member_say(member, file + 4, leadin);
}
goto done; goto done;
} }
if (!switch_is_file_path(file)) { if (!switch_is_file_path(file)) {
@ -2393,7 +2395,7 @@ static switch_status_t conference_member_play_file(conference_member_t *member,
goto done; goto done;
} }
file = dfile; file = dfile;
} else { } else if (!switch_strlen_zero(file)) {
status = conference_member_say(member, file, leadin); status = conference_member_say(member, file, leadin);
goto done; goto done;
} }
@ -2721,7 +2723,7 @@ static switch_status_t conf_api_sub_mute(conference_member_t *member, switch_str
return SWITCH_STATUS_GENERR; return SWITCH_STATUS_GENERR;
switch_clear_flag_locked(member, MFLAG_CAN_SPEAK); 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); conference_member_play_file(member, member->conference->muted_sound, 0);
} else { } else {
char msg[512]; char msg[512];
@ -2753,7 +2755,7 @@ static switch_status_t conf_api_sub_unmute(conference_member_t *member, switch_s
if (stream != NULL) { if (stream != NULL) {
stream->write_function(stream, "OK unmute %u\n", member->id); 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); conference_member_play_file(member, member->conference->unmuted_sound, 0);
} else { } else {
char msg[512]; char msg[512];