]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-7513: exit if layer->cur_img not secured
authorAnthony Minessale <anthm@freeswitch.org>
Wed, 29 Apr 2015 16:07:57 +0000 (11:07 -0500)
committerMichael Jerris <mike@jerris.com>
Thu, 28 May 2015 17:47:26 +0000 (12:47 -0500)
src/mod/applications/mod_conference/mod_conference.c

index a34146e3ea7b86dca5249b14384db1f8c088ce83..d9d835e918dd97e536f1ae25f762929b8e7bbdf6 100644 (file)
@@ -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);