kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix crash, no all members has channel

This commit is contained in:
Seven Du 2013-08-28 20:37:23 +08:00
parent 4d2272ca3d
commit b16a13c091
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1608,7 +1608,7 @@ static void conference_set_video_floor_holder(conference_obj_t *conference, conf
conference_member_t *imember; conference_member_t *imember;
for (imember = conference->members; imember; imember = imember->next) { for (imember = conference->members; imember; imember = imember->next) {
if (imember != conference->video_floor_holder && switch_channel_test_flag(imember->channel, CF_VIDEO)) { if (imember != conference->video_floor_holder && imember->channel && switch_channel_test_flag(imember->channel, CF_VIDEO)) {
member = imember; member = imember;
break; break;
} }
@ -1659,7 +1659,8 @@ static void conference_set_floor_holder(conference_obj_t *conference, conference
int old_id = 0; int old_id = 0;
if (!switch_test_flag(conference, CFLAG_VIDEO_BRIDGE) && if (!switch_test_flag(conference, CFLAG_VIDEO_BRIDGE) &&
((conference->video_floor_holder && !member) || (member && switch_channel_test_flag(member->channel, CF_VIDEO)))) { ((conference->video_floor_holder && !member) ||
(member && member->channel && switch_channel_test_flag(member->channel, CF_VIDEO)))) {
conference_set_video_floor_holder(conference, member, SWITCH_FALSE); conference_set_video_floor_holder(conference, member, SWITCH_FALSE);
} }