From 4a280c70e4e07e154cbfaa7c1cb6b93636d7e566 Mon Sep 17 00:00:00 2001 From: Mike Jerris Date: Mon, 17 Apr 2017 14:28:21 -0500 Subject: [PATCH] FS-10236: [core] fix crash on hangup with multiple media bugs --- src/switch_core_media_bug.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/switch_core_media_bug.c b/src/switch_core_media_bug.c index c6eea3b691..c3948de0ab 100644 --- a/src/switch_core_media_bug.c +++ b/src/switch_core_media_bug.c @@ -1216,14 +1216,16 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_enumerate(switch_core_sess SWITCH_DECLARE(switch_status_t) switch_core_media_bug_remove_all_function(switch_core_session_t *session, const char *function) { - switch_media_bug_t *bp, *last = NULL; + switch_media_bug_t *bp, *last = NULL, *next = NULL; switch_status_t status = SWITCH_STATUS_FALSE; switch_media_bug_t *closed = NULL; if (session->bugs) { switch_thread_rwlock_wrlock(session->bug_rwlock); - for (bp = session->bugs; bp; bp = bp->next) { - if (!switch_test_flag(session, SSF_DESTROYABLE) && + for (bp = session->bugs; bp; bp = next) { + next = bp->next; + + 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"); last = bp; -- 2.47.2