From c78e58abc70f7d986de4bd558ff1424fbdec7b3d Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Mon, 26 Jun 2017 16:31:34 -0500 Subject: [PATCH] FS-10409: [core] Crash (ABRT) using conferencing -- related to FS-10132 #resolve --- .../applications/mod_conference/conference_video.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c index f8433c56bf..6bf9d07db4 100644 --- a/src/mod/applications/mod_conference/conference_video.c +++ b/src/mod/applications/mod_conference/conference_video.c @@ -2829,9 +2829,9 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr if (conference->members_with_video == 1 && file_count) { total = 0; } - + if (conference->video_layout_group && (lg = switch_core_hash_find(conference->layout_group_hash, conference->video_layout_group))) { - if ((vlayout = conference_video_find_best_layout(conference, lg, total + file_count, file_count))) { + if ((vlayout = conference_video_find_best_layout(conference, lg, total, 0))) { conference_video_init_canvas_layers(conference, imember->canvas, vlayout); } } @@ -3023,8 +3023,6 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr layer = &imember->canvas->layers[i++]; conference_video_scale_and_patch(layer, img, SWITCH_FALSE); } - - switch_img_free(&img); } if (imember->session) { @@ -3032,9 +3030,11 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr } } + for (j = 0; j < file_count; j++) { + switch_img_free(&file_imgs[j]); + } + if (files_playing && !file_count) { - switch_img_free(&file_imgs[0]); - switch_img_free(&file_imgs[1]); files_playing = 0; }