From f51b5d2dceab857dce66e2c5e9acb5799aabea9c Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Thu, 19 Oct 2017 13:24:40 -0500 Subject: [PATCH] FS-10734: [mod_conference] Fix deadlock on hangup race #resolve --- src/mod/applications/mod_conference/conference_video.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c index 03b7866c36..8daf4108e4 100644 --- a/src/mod/applications/mod_conference/conference_video.c +++ b/src/mod/applications/mod_conference/conference_video.c @@ -3149,7 +3149,9 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr write_frame.packetlen = 0; if (imember->mux_out_queue && switch_frame_buffer_dup(imember->fb, &write_frame, &dupframe) == SWITCH_STATUS_SUCCESS) { - switch_queue_push(imember->mux_out_queue, dupframe); + if (switch_queue_trypush(imember->mux_out_queue, dupframe) != SWITCH_STATUS_SUCCESS) { + switch_frame_buffer_free(imember->fb, &dupframe); + } dupframe = NULL; } }