diff options
author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-07 17:46:37 +0000 |
---|---|---|
committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-07 17:46:37 +0000 |
commit | 18109e0deb6d756c1bdd99743a7996004bd8017b (patch) | |
tree | afb4d29146706adba1c5a0953087feb48b13f60f /channels | |
parent | a5c7f216deb96527e4387e78c54bc7a611baf6a9 (diff) |
Merged revisions 222543 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r222543 | dvossel | 2009-10-07 12:44:52 -0500 (Wed, 07 Oct 2009) | 14 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@222545 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_sip.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 5610d3cc7..3db6e6e6b 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -17890,7 +17890,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); /* 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; |