diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-15 18:13:13 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-15 18:13:13 +0000 |
| commit | b44a0abda9ef73b952daf4b7644d5a6462f27324 (patch) | |
| tree | 22e385eff8936c6ef8569a792b904cb6043c2139 | |
| parent | d8bb00e88cbed708e3e7d67f193830b55b757637 (diff) | |
Merged revisions 164351 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r164351 | file | 2008-12-15 14:12:24 -0400 (Mon, 15 Dec 2008) | 13 lines
Merged revisions 164350 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r164350 | file | 2008-12-15 14:11:21 -0400 (Mon, 15 Dec 2008) | 6 lines
Do not try to unlock a non-existant channel if the transfer fails.
(closes issue #13800)
Reported by: dwagner
Patches:
asterisk-1.4.22-chan-sip-nullp.patch uploaded by tweety (license 608)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@164352 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 711dc3183..e544de462 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -16894,7 +16894,9 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int sip_pvt_unlock(p); if (p->refer->refer_call) { sip_pvt_unlock(p->refer->refer_call); - ast_channel_unlock(p->refer->refer_call->owner); + if (p->refer->refer_call->owner) { + ast_channel_unlock(p->refer->refer_call->owner); + } } p->invitestate = INV_COMPLETED; return -1; |