From: Anthony Minessale <anthm@freeswitch.org>
Date: Thu, 8 Sep 2016 18:00:49 +0000 (-0500)
Subject: FS-9493 #resolve [Possible crash when changing from normal to personal canvas on... 
X-Git-Tag: v1.6.11~9^2~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55e41a8ea3162594a7398b6d9d936c308705fa55;p=thirdparty%2Ffreeswitch.git

FS-9493 #resolve [Possible crash when changing from normal to personal canvas on the fly]
---

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index 84e16366ac..d2a00a1902 100644
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -2900,7 +2900,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
 				switch_frame_t *dupframe;
 
 				if (!imember->rec && 
-					(!imember->session || !switch_channel_test_flag(imember->channel, CF_VIDEO_READY) ||
+					(!imember->session || !switch_channel_test_flag(imember->channel, CF_VIDEO_READY) || !imember->canvas ||
 					 switch_core_session_read_lock(imember->session) != SWITCH_STATUS_SUCCESS)) {
 					continue;
 				}