From: Michael Jerris <mike@jerris.com>
Date: Thu, 30 Jun 2016 17:27:43 +0000 (-0500)
Subject: FS-9314: [mod_conference]  fix crash when starting conference in mux mode while speci... 
X-Git-Tag: v1.6.10~1^2~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6b4934ea8b6f3e56abe48384d51cc43e4ca8422;p=thirdparty%2Ffreeswitch.git

FS-9314: [mod_conference]  fix crash when starting conference in mux mode while specifying or defaulting to a layout group that does not exist.  We will now fall back to transcode mode in this case.
---

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index 7fccb51fa6..13f15a2af7 100644
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -1354,6 +1354,10 @@ video_layout_t *conference_video_find_best_layout(conference_obj_t *conference,
 		}
 	}
 
+	if (!lg) {
+		return NULL;
+	}
+
 	for (vlnode = lg->layouts; vlnode; vlnode = vlnode->next) {
 		if (vlnode->vlayout->layers >= (int)count) {
 			break;