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

FS-10409: [core] Crash (ABRT) using conferencing -- related to FS-10132 #resolve

This commit is contained in:
Anthony Minessale 2017-06-26 16:31:34 -05:00
parent d8fcb60155
commit 10e7e3429b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3446,9 +3446,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);
}
}
@ -3639,8 +3639,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) {
@ -3648,9 +3646,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;
}