diff options
| author | Russell Bryant <russell@russellbryant.com> | 2008-03-12 17:02:57 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2008-03-12 17:02:57 +0000 |
| commit | f7e28b12fe4f8259d6c3f2ee0088c912a89d404e (patch) | |
| tree | cd306a7699d95b5003c7898ea52ef0e6dd0d2399 /main/channel.c | |
| parent | 582d3b4ba7ef209619ff8866d78a5007242068d6 (diff) | |
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
Diffstat (limited to 'main/channel.c')
| -rw-r--r-- | main/channel.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c index 20f432682..19d7a7c2c 100644 --- a/main/channel.c +++ b/main/channel.c @@ -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); |