From 2f61fe01932676c2fa130aa0a0354b67dc786677 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Wed, 12 Aug 2015 18:31:30 -0400 Subject: [PATCH] FS-7958: [mod_conference] fix race condition causing crash in conference video MCU --- src/mod/applications/mod_conference/conference_video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c index 9b63b4aaea..3233fea8d1 100644 --- a/src/mod/applications/mod_conference/conference_video.c +++ b/src/mod/applications/mod_conference/conference_video.c @@ -1922,7 +1922,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr switch_mutex_lock(conference->member_mutex); for (imember = conference->members; imember; imember = imember->next) { - if (switch_channel_ready(imember->channel) && conference_utils_member_test_flag(imember, MFLAG_RUNNING) + if (imember->channel && switch_channel_ready(imember->channel) && conference_utils_member_test_flag(imember, MFLAG_RUNNING) && imember->canvas_id == canvas->canvas_id) { canvas_count++; }