From dfa791e0459a46a725e88d90c5456bfe63285843 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Fri, 15 Jan 2016 13:29:29 -0600 Subject: [PATCH] FS-8721 #resolve [Bug removal at call end causes eavesdrop memory leak] #comment This should do it, bug_remove_all is called after destroy where it's more than safe to kill bugs indiscriminately --- src/switch_core_media_bug.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/switch_core_media_bug.c b/src/switch_core_media_bug.c index 6f247d2102..c97f277b4b 100644 --- a/src/switch_core_media_bug.c +++ b/src/switch_core_media_bug.c @@ -1101,7 +1101,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_remove_all_function(switch if (session->bugs) { switch_thread_rwlock_wrlock(session->bug_rwlock); for (bp = session->bugs; bp; bp = bp->next) { - if ((bp->thread_id && bp->thread_id != switch_thread_self()) || switch_test_flag(bp, SMBF_LOCK)) { + if (!switch_test_flag(session, SSF_DESTROYABLE) && + ((bp->thread_id && bp->thread_id != switch_thread_self()) || switch_test_flag(bp, SMBF_LOCK))) { switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "BUG is thread locked skipping.\n"); continue; }