提交 4a278c11 authored 作者: Anthony Minessale's avatar Anthony Minessale

extra blank-string protection

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9237 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 2f405f4b
...@@ -2384,7 +2384,9 @@ static switch_status_t conference_member_play_file(conference_member_t *member, ...@@ -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)) {
status = conference_member_say(member, file + 4, leadin); if (!switch_strlen_zero(file + 4)) {
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, ...@@ -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 ...@@ -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 ...@@ -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];
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论