Merged revisions 114624 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r114624 | mmichelson | 2008-04-24 15:04:24 -0500 (Thu, 24 Apr 2008) | 10 lines

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

........

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

diff --git a/channels/chan_local.c b/channels/chan_local.c
index cc6ba8d684bc26a880295d985dd6ff9077407d92..636dad7c291f7f141e1c789de2424fe8f18993e0 100644 (file)
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -551,7 +551,13 @@ static int local_hangup(struct ast_channel *ast)
                        /* 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) {