summaryrefslogtreecommitdiff
path: root/channels
diff options
context:
space:
mode:
authorDavid Vossel <dvossel@digium.com>2009-10-07 17:44:52 +0000
committerDavid Vossel <dvossel@digium.com>2009-10-07 17:44:52 +0000
commitf819ce5b2031c48a6db864b9a3d9d67f4b5e7e77 (patch)
treed75ebe007fde1810da8663e9c03bfd2bec52f097 /channels
parentb5eb0449c0e6307bb83fe26e6c9cfcacd7ca274e (diff)
Merged revisions 222542 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r222542 | dvossel | 2009-10-07 12:41:21 -0500 (Wed, 07 Oct 2009) | 8 lines crash on transfer handle_invite_replaces() attempts to uplock a pvt's owner channel without first verifing that it exists. (issue #16027) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@222543 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_sip.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index fbe07f3b8..047a86c1b 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -19750,7 +19750,10 @@ static int handle_invite_replaces(struct sip_pvt *p, struct sip_request *req, in
can't harm */
transmit_response_with_sdp(p, "200 OK", req, XMIT_RELIABLE, FALSE, FALSE);
/* Do something more clever here */
- ast_channel_unlock(c);
+ if (c) {
+ *nounlock = 1;
+ ast_channel_unlock(c);
+ }
ast_channel_unlock(replacecall);
sip_pvt_unlock(p->refer->refer_call);
return 1;