FS-4960 --resolve

diff --git a/src/switch_core_session.c b/src/switch_core_session.c
index 3a2c08bcc3b8a91c9c7cc1162cfdb574e0028dbe..b0073e670e3919dfbe1bf0a50a790f0c1b4f543d 100644 (file)
--- a/src/switch_core_session.c
+++ b/src/switch_core_session.c
@@ -1186,9 +1186,17 @@ SWITCH_DECLARE(uint32_t) switch_core_session_flush_private_events(switch_core_se
 
        if (session->private_event_queue) {
                while ((status = (switch_status_t) switch_queue_trypop(session->private_event_queue_pri, &pop)) == SWITCH_STATUS_SUCCESS) {
+                       if (pop) {
+                               switch_event_t *event = (switch_event_t *) pop;
+                               switch_event_destroy(&event);
+                       }
                        x++;
                }
                while ((status = (switch_status_t) switch_queue_trypop(session->private_event_queue, &pop)) == SWITCH_STATUS_SUCCESS) {
+                       if (pop) {
+                               switch_event_t *event = (switch_event_t *) pop;
+                               switch_event_destroy(&event);
+                       }
                        x++;
                }
                check_media(session);
@@ -1320,6 +1328,9 @@ SWITCH_DECLARE(void) switch_core_session_perform_destroy(switch_core_session_t *
        switch_endpoint_interface_t *endpoint_interface = (*session)->endpoint_interface;
        int i;
 
+
+       switch_core_session_flush_private_events(*session);
+
        if (switch_core_session_running(*session) && !switch_test_flag((*session), SSF_DESTROYABLE)) {
                switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_core_session_get_uuid(*session), SWITCH_LOG_ERROR,
                                                  "Cowardly ignoring an attempt to call destroy on a running session.\n");