[asterisk-commits] mmichelson: branch 1.4 r114624 - /branches/1.4/channels/chan_local.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Apr 24 15:04:24 2008
New Revision: 114624

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114624
Log:
Resolve a deadlock in chan_local by releasing the channel lock
temporarily.

(closes issue #11712)
Reported by: callguy
Patches:
      11712.patch uploaded by putnopvut (license 60)
Tested by: acunningham


Modified:
    branches/1.4/channels/chan_local.c

Modified: branches/1.4/channels/chan_local.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_local.c?view=diff&rev=114624&r1=114623&r2=114624
==============================================================================
--- branches/1.4/channels/chan_local.c (original)
+++ branches/1.4/channels/chan_local.c Thu Apr 24 15:04:24 2008
@@ -515,7 +515,13 @@
 			/* Deadlock avoidance */
 			while (p->owner && ast_channel_trylock(p->owner)) {
 				ast_mutex_unlock(&p->lock);
+				if (ast) {
+					ast_channel_unlock(ast);
+				}
 				usleep(1);
+				if (ast) {
+					ast_channel_lock(ast);
+				}
 				ast_mutex_lock(&p->lock);
 			}
 			if (p->owner) {