kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1251 in FS/freeswitch from ~BRADLEYJOKINEN/freeswitch:FS-10231 to master 

* commit '68b241fc43a2d4d220eac389b706cf449fb46bd8':
  FS-10231 Fix issue with media bugs not being completely cleaned up when session is destroyed
This commit is contained in:
Mike Jerris 2017-04-14 15:37:47 +00:00
parent 075cd0d179 68b241fc43
commit fbbc6e1416
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/switch_core_media_bug.c
View File

@ -1130,17 +1130,13 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_remove_all_function(switch
continue; continue;
} }
if (bp->callback) {
bp->callback(bp, bp->user_data, SWITCH_ABC_TYPE_CLOSE);
}
switch_core_media_bug_destroy(bp);
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Removing BUG from %s\n", switch_channel_get_name(session->channel));
if (last) { if (last) {
last->next = bp->next; last->next = bp->next;
} else { } else {
session->bugs = bp->next; session->bugs = bp->next;
} }
switch_core_media_bug_close(&bp);
} }
switch_thread_rwlock_unlock(session->bug_rwlock); switch_thread_rwlock_unlock(session->bug_rwlock);
status = SWITCH_STATUS_SUCCESS; status = SWITCH_STATUS_SUCCESS;