[svn-commits] mmichelson: branch 1.6.0 r148914 - in /branches/1.6.0: ./ channels/chan_local.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Tue Oct 14 12:39:04 2008
New Revision: 148914

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

................
r148913 | mmichelson | 2008-10-14 12:38:06 -0500 (Tue, 14 Oct 2008) | 17 lines

Merged revisions 148912 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r148912 | mmichelson | 2008-10-14 12:33:38 -0500 (Tue, 14 Oct 2008) | 9 lines

Deadlock prevention in chan_local.

(closes issue #13676)
Reported by: tacvbo
Patches:
      13676.patch uploaded by putnopvut (license 60)
Tested by: tacvbo


........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_local.c

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

Modified: branches/1.6.0/channels/chan_local.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_local.c?view=diff&rev=148914&r1=148913&r2=148914
==============================================================================
--- branches/1.6.0/channels/chan_local.c (original)
+++ branches/1.6.0/channels/chan_local.c Tue Oct 14 12:39:04 2008
@@ -551,8 +551,12 @@
 	} else {
 		p->owner = NULL;
 		ast_module_user_remove(p->u_owner);
+		while (p->chan && ast_channel_trylock(p->chan)) {
+			DEADLOCK_AVOIDANCE(&p->lock);
+		}
 		if (p->chan) {
 			ast_queue_hangup(p->chan);
+			ast_channel_unlock(p->chan);
 		}
 	}