From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 29 Apr 2015 16:07:57 +0000 (-0500)
Subject: FS-7513: exit if layer->cur_img not secured
X-Git-Tag: v1.6.2~614^2~100
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=86a1ef3d27a5aa5ff86f3c1eca570c285d2f5640;p=thirdparty%2Ffreeswitch.git

FS-7513: exit if layer->cur_img not secured
---

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index a34146e3ea..d9d835e918 100644
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -1050,7 +1050,12 @@ static void scale_and_patch(conference_obj_t *conference, mcu_layer_t *layer, sw
 	IMG = conference->canvas->img;
 	img = ximg ? ximg : layer->cur_img;
 
-	switch_assert(IMG && img);
+	switch_assert(IMG);
+
+	if (!img) {
+		switch_mutex_unlock(conference->canvas->mutex);
+		return;
+	}
 
 	if (layer->refresh) {
 		switch_img_fill(conference->canvas->img, layer->x_pos, layer->y_pos, layer->screen_w, layer->screen_h, &conference->canvas->letterbox_bgcolor);