[asterisk-commits] file: branch 1.4 r190286 - /branches/1.4/channels/chan_local.c

[SVN commits to the Asterisk project]

Author: file
Date: Thu Apr 23 14:13:18 2009
New Revision: 190286

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=190286
Log:
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.

Modified:
    branches/1.4/channels/chan_local.c

Modified: branches/1.4/channels/chan_local.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.4/channels/chan_local.c?view=diff&rev=190286&r1=190285&r2=190286
==============================================================================
--- branches/1.4/channels/chan_local.c (original)
+++ branches/1.4/channels/chan_local.c Thu Apr 23 14:13:18 2009
@@ -590,13 +590,10 @@
 		   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) {