mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-29 18:19:30 +00:00
Merged revisions 108031 via svnmerge from
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:
@@ -1287,7 +1287,6 @@ void ast_channel_free(struct ast_channel *chan)
|
||||
if (chan->pbx)
|
||||
ast_log(LOG_WARNING, "PBX may not have been terminated properly on '%s'\n", chan->name);
|
||||
free_cid(&chan->cid);
|
||||
ast_mutex_destroy(&chan->lock_dont_use);
|
||||
/* Close pipes if appropriate */
|
||||
if ((fd = chan->alertpipe[0]) > -1)
|
||||
close(fd);
|
||||
@@ -1321,6 +1320,8 @@ void ast_channel_free(struct ast_channel *chan)
|
||||
|
||||
/* Destroy the jitterbuffer */
|
||||
ast_jb_destroy(chan);
|
||||
|
||||
ast_mutex_destroy(&chan->lock_dont_use);
|
||||
|
||||
ast_string_field_free_memory(chan);
|
||||
ast_free(chan);
|
||||
|
Reference in New Issue
Block a user