aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2005-08-11 16:43:36 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2005-08-11 16:43:36 +0000
commit669088c502f06817bd40aeee69c8c0e039000a63 (patch)
treeece73def5791eed772cf429826baec066377bfc3 /channels
parent12356e59f168385e88e59085e601d775dfe60a21 (diff)
Fix potential deadlock in asterisk
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6321 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rwxr-xr-xchannels/chan_zap.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index b352a1fa6..3b135e279 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -3200,6 +3200,7 @@ static int attempt_transfer(struct zt_pvt *p)
ast_log(LOG_DEBUG, "Neither %s nor %s are in a bridge, nothing to transfer\n",
p->subs[SUB_REAL].owner->name, p->subs[SUB_THREEWAY].owner->name);
p->subs[SUB_THREEWAY].owner->_softhangup |= AST_SOFTHANGUP_DEV;
+ return -1;
}
return 0;
}