[asterisk-commits] file: branch 1.6.1 r190291 - in /branches/1.6.1: ./ channels/chan_local.c

[SVN commits to the Asterisk project]

Author: file
Date: Thu Apr 23 14:17:36 2009
New Revision: 190291

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=190291
Log:
Merged revisions 190287 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r190287 | file | 2009-04-23 16:15:30 -0300 (Thu, 23 Apr 2009) | 13 lines
  
  Merged revisions 190286 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r190286 | file | 2009-04-23 16:13:18 -0300 (Thu, 23 Apr 2009) | 6 lines
    
    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.6.1/   (props changed)
    branches/1.6.1/channels/chan_local.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_local.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/channels/chan_local.c?view=diff&rev=190291&r1=190290&r2=190291
==============================================================================
--- branches/1.6.1/channels/chan_local.c (original)
+++ branches/1.6.1/channels/chan_local.c Thu Apr 23 14:17:36 2009
@@ -620,13 +620,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) {