retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

Merge pull request #665 in FS/freeswitch from ~CXREG/freeswitch-8721:master to master 

* commit '7020d21e292090c4dc644fa47df1a3a9bd98ba78':
  FS-8721: avoid memory leak when removing thread-locked bugs
This commit is contained in:
Mike Jerris 2016-01-12 11:58:39 -06:00
parent aee36dfc59 7020d21e29
commit aa440200ee
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/switch_core_media_bug.c
View File

@ -1095,7 +1095,7 @@ 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;
switch_media_bug_t *bp, *last = NULL;
switch_status_t status = SWITCH_STATUS_FALSE;
if (session->bugs) {
@ -1116,8 +1116,14 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_remove_all_function(switch
}
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) {
last->next = bp->next;
} else {
session->bugs = bp->next;
}
last = bp;
}
session->bugs = NULL;
switch_thread_rwlock_unlock(session->bug_rwlock);
status = SWITCH_STATUS_SUCCESS;
}