From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 12 Mar 2008 16:59:07 +0000 (+0000)
Subject: Destroy the channel lock after the channel datastores.
X-Git-Tag: 1.4.19-rc3~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2016f5ba100fcadeef8f557d51f8e9db0228f9bf;p=thirdparty%2Fasterisk.git

Destroy the channel lock after the channel datastores.

(inspired by issue #12187)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@108031 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/channel.c b/main/channel.c
index a12c4ef441..e037d211d1 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -1223,7 +1223,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);
 	/* Close pipes if appropriate */
 	if ((fd = chan->alertpipe[0]) > -1)
 		close(fd);
@@ -1250,6 +1249,8 @@ void ast_channel_free(struct ast_channel *chan)
 
 	/* Destroy the jitterbuffer */
 	ast_jb_destroy(chan);
+	
+	ast_mutex_destroy(&chan->lock);
 
 	ast_string_field_free_memory(chan);
 	free(chan);