FS-8184 #resolve [Fix possible memory leak in mod_conference when hanging up on a...

diff --git a/src/mod/applications/mod_conference/conference_member.c b/src/mod/applications/mod_conference/conference_member.c
index dd0e4f2a56308f97c22007f2b0e19867454a1330..8d5af7fa628fcf9c622aa6a008a64cdb4221dbfe 100644 (file)
--- a/src/mod/applications/mod_conference/conference_member.c
+++ b/src/mod/applications/mod_conference/conference_member.c
@@ -1160,6 +1160,8 @@ switch_status_t conference_member_del(conference_obj_t *conference, conference_m
                        conference->count--;
                }
 
+               conference_video_check_flush(member);
+
                if (conference_utils_member_test_flag(member, MFLAG_ENDCONF)) {
                        if (!--conference->end_count) {
                                //conference_utils_set_flag_locked(conference, CFLAG_DESTRUCT);

diff --git a/src/mod/applications/mod_conference/mod_conference.h b/src/mod/applications/mod_conference/mod_conference.h
index 12dc76d6943fdd7587fa4dc8916f4ca05641acd5..ff19ff44f5a902912506fb545b2f23b0c5fdc48a 100644 (file)
--- a/src/mod/applications/mod_conference/mod_conference.h
+++ b/src/mod/applications/mod_conference/mod_conference.h
@@ -917,6 +917,7 @@ void conference_video_layer_set_banner(conference_member_t *member, mcu_layer_t
 void conference_video_layer_set_logo(conference_member_t *member, mcu_layer_t *layer, const char *path);
 void conference_video_detach_video_layer(conference_member_t *member);
 void conference_video_check_used_layers(mcu_canvas_t *canvas);
+void conference_video_check_flush(conference_member_t *member);
 void conference_video_set_canvas_letterbox_bgcolor(mcu_canvas_t *canvas, char *color);
 void conference_video_set_canvas_bgcolor(mcu_canvas_t *canvas, char *color);
 void conference_video_scale_and_patch(mcu_layer_t *layer, switch_image_t *ximg, switch_bool_t freeze);