From 2602b21b397b19f1f8529b27b3ff453ecd3562b5 Mon Sep 17 00:00:00 2001
From: Mark Michelson <mmichelson@digium.com>
Date: Thu, 24 Apr 2008 20:06:06 +0000
Subject: [PATCH] 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
---
channels/chan_local.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/channels/chan_local.c b/channels/chan_local.c
index cc6ba8d684..636dad7c29 100644
--- 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) {
--
GitLab