kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-9198 #resolve [Small memory leaks in mod_skinny]

This commit is contained in:
Anthony Minessale 2016-05-26 10:09:57 -05:00
parent 0630f334f2
commit 67e1db09d3
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mod/applications/mod_conference/conference_video.c
View File

@ -330,9 +330,13 @@ void conference_video_reset_image(switch_image_t *img, switch_rgb_color_t *color
void conference_video_clear_layer(mcu_layer_t *layer) void conference_video_clear_layer(mcu_layer_t *layer)
{ {
switch_img_fill(layer->canvas->img, layer->x_pos, layer->y_pos, layer->screen_w, layer->screen_h, &layer->canvas->bgcolor); if (layer->canvas && layer->canvas->img) {
switch_img_fill(layer->canvas->img, layer->x_pos, layer->y_pos, layer->screen_w, layer->screen_h, &layer->canvas->bgcolor);
}
layer->banner_patched = 0; layer->banner_patched = 0;
layer->refresh = 1; layer->refresh = 1;
} }
void conference_video_reset_layer(mcu_layer_t *layer) void conference_video_reset_layer(mcu_layer_t *layer)
@ -641,8 +645,7 @@ void conference_video_detach_video_layer(conference_member_t *member)
switch_mutex_lock(canvas->mutex); switch_mutex_lock(canvas->mutex);
if (member->video_layer_id < 0) { if (member->video_layer_id < 0) {
switch_mutex_unlock(canvas->mutex); goto end;
return;
} }
layer = &canvas->layers[member->video_layer_id]; layer = &canvas->layers[member->video_layer_id];
@ -676,6 +679,8 @@ void conference_video_detach_video_layer(conference_member_t *member)
conference_video_set_canvas_bgimg(canvas, NULL); conference_video_set_canvas_bgimg(canvas, NULL);
} }
end:
switch_mutex_unlock(canvas->mutex); switch_mutex_unlock(canvas->mutex);
conference_video_release_canvas(&canvas); conference_video_release_canvas(&canvas);