diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-07-24 23:53:02 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-07-24 23:53:02 +0000 |
| commit | c6421a8e880b4e82ae64e3bcc377f1f7682429cf (patch) | |
| tree | 7ea6e526fca8ede4c85e6700507ce217de26a789 /channels/chan_zap.c | |
| parent | 602a7b9652dbb61b85176cea9a2a1a9060abe578 (diff) | |
Sometimes we get subunalloced, gotta free lock first
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3507 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_zap.c')
| -rwxr-xr-x | channels/chan_zap.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 0920be36b..2510763a8 100755 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -2869,7 +2869,8 @@ static int attempt_transfer(struct zt_pvt *p) p->subs[SUB_REAL].owner->bridge->name, p->subs[SUB_THREEWAY].owner->name); return -1; } - /* Orphan the channel */ + /* Orphan the channel after releasing the lock */ + ast_mutex_unlock(&p->subs[SUB_THREEWAY].owner->lock); unalloc_sub(p, SUB_THREEWAY); } else if (p->subs[SUB_THREEWAY].owner->bridge) { if (p->subs[SUB_REAL].owner->_state == AST_STATE_RINGING) { @@ -2882,6 +2883,7 @@ static int attempt_transfer(struct zt_pvt *p) return -1; } swap_subs(p, SUB_THREEWAY, SUB_REAL); + ast_mutex_unlock(&p->subs[SUB_THREEWAY].owner->lock); unalloc_sub(p, SUB_THREEWAY); /* Tell the caller not to hangup */ return 1; @@ -3213,7 +3215,8 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast) } } else p->subs[SUB_THREEWAY].owner->_softhangup |= AST_SOFTHANGUP_DEV; - ast_mutex_unlock(&p->subs[SUB_THREEWAY].owner->lock); + if (p->subs[SUB_THREEWAY].owner) + ast_mutex_unlock(&p->subs[SUB_THREEWAY].owner->lock); } else { ast_mutex_unlock(&p->subs[SUB_THREEWAY].owner->lock); /* Swap subs and dis-own channel */ |