kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-07-03 06:06:09 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Anthony Minessale 2015-04-29 11:07:57 -05:00 committed by Michael Jerris
parent 9c459f881e
commit 86a1ef3d27
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mod/applications/mod_conference/mod_conference.c
View File

@ -1050,7 +1050,12 @@ static void scale_and_patch(conference_obj_t *conference, mcu_layer_t *layer, sw
IMG = conference->canvas->img; IMG = conference->canvas->img;
img = ximg ? ximg : layer->cur_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) { 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); switch_img_fill(conference->canvas->img, layer->x_pos, layer->y_pos, layer->screen_w, layer->screen_h, &conference->canvas->letterbox_bgcolor);