From: Joshua Colp <jcolp@digium.com>
Date: Thu, 23 Apr 2009 19:13:18 +0000 (+0000)
Subject: Fix a bug in chan_local glare hangup detection.
X-Git-Tag: 1.4.25-rc1~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8a55273cfa4ced71966791c57a1ad9431763cb8;p=thirdparty%2Fasterisk.git

Fix a bug in chan_local glare hangup detection.

If both sides of a Local channel were hung up at around the same time it was
possible for one thread to destroy the local private structure and have the other thread
immediately try to remove the already freed structure from the local channel list.


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

diff --git a/channels/chan_local.c b/channels/chan_local.c
index db8bec313b..aa81af51c1 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -590,13 +590,10 @@ static int local_hangup(struct ast_channel *ast)
 		   let local_queue do it. */
 		if (glaredetect)
 			ast_set_flag(p, LOCAL_CANCEL_QUEUE);
-		ast_mutex_unlock(&p->lock);
 		/* Remove from list */
 		AST_LIST_LOCK(&locals);
 		AST_LIST_REMOVE(&locals, p, list);
 		AST_LIST_UNLOCK(&locals);
-		/* Grab / release lock just in case */
-		ast_mutex_lock(&p->lock);
 		ast_mutex_unlock(&p->lock);
 		/* And destroy */
 		if (!glaredetect) {