kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 10:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 108031 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r108031 | russell | 2008-03-12 11:59:07 -0500 (Wed, 12 Mar 2008) | 4 lines

Destroy the channel lock after the channel datastores.

(inspired by issue #12187)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@108032 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2008-03-12 17:02:57 +00:00
parent 582d3b4ba7
commit f7e28b12fe
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
main/channel.c
View File

@@ -1287,7 +1287,6 @@ void ast_channel_free(struct ast_channel *chan)
if (chan->pbx) if (chan->pbx)
ast_log(LOG_WARNING, "PBX may not have been terminated properly on '%s'\n", chan->name); ast_log(LOG_WARNING, "PBX may not have been terminated properly on '%s'\n", chan->name);
free_cid(&chan->cid); free_cid(&chan->cid);
ast_mutex_destroy(&chan->lock_dont_use);
/* Close pipes if appropriate */ /* Close pipes if appropriate */
if ((fd = chan->alertpipe[0]) > -1) if ((fd = chan->alertpipe[0]) > -1)
close(fd); close(fd);
@@ -1322,6 +1321,8 @@ void ast_channel_free(struct ast_channel *chan)
/* Destroy the jitterbuffer */ /* Destroy the jitterbuffer */
ast_jb_destroy(chan); ast_jb_destroy(chan);
ast_mutex_destroy(&chan->lock_dont_use);
ast_string_field_free_memory(chan); ast_string_field_free_memory(chan);
ast_free(chan); ast_free(chan);
AST_RWLIST_UNLOCK(&channels); AST_RWLIST_UNLOCK(&channels);