summaryrefslogtreecommitdiff
path: root/channels
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2008-12-15 18:12:24 +0000
committerJoshua Colp <jcolp@digium.com>2008-12-15 18:12:24 +0000
commitae30bbf43dc391f38278c96ecb9f76f5662560d8 (patch)
treee0cae8ae42a9f431737206b74805d8e3f4c0ae67 /channels
parentb584784f85d3064da0c8d959d3bd3f50d1b7cf46 (diff)
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: https://origsvn.digium.com/svn/asterisk/trunk@164351 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_sip.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 37ae2ca24..30d611cc1 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -18371,7 +18371,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;