]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-7958: [mod_conference] fix race condition causing crash in conference video MCU
authorMichael Jerris <mike@jerris.com>
Wed, 12 Aug 2015 22:31:30 +0000 (18:31 -0400)
committerMichael Jerris <mike@jerris.com>
Wed, 12 Aug 2015 22:31:30 +0000 (18:31 -0400)
src/mod/applications/mod_conference/conference_video.c

index 9b63b4aaea50c1723292f8155a1bc54522150bc5..3233fea8d1d0cbf063702bfc0d8c4d63103f74ac 100644 (file)
@@ -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++;
                                }