kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-06-27 10:54:50 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix a crash when doing call pickups with SIP phones. The code unlocked the

Browse Source 
channel when it should not have.
(issue #9652, reported by corruptor, fixed by me)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@67862 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-06-06 21:14:46 +00:00
parent e8900612be
commit 6595debbc5
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_sip.c
+4 -3
View File
@@ -1500,7 +1500,7 @@ static void build_rpid(struct sip_pvt *p);
/*------Request handling functions */
static int handle_request(struct sip_pvt *p, struct sip_request *req, struct sockaddr_in *sin, int *recount, int *nounlock);
static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int debug, int seqno, struct sockaddr_in *sin, int *recount, char *e);
static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int debug, int seqno, struct sockaddr_in *sin, int *recount, char *e, int *nounlock);
static int handle_request_refer(struct sip_pvt *p, struct sip_request *req, int debug, int ignore, int seqno, int *nounlock);
static int handle_request_bye(struct sip_pvt *p, struct sip_request *req);
static int handle_request_register(struct sip_pvt *p, struct sip_request *req, struct sockaddr_in *sin, char *e);
@@ -13260,7 +13260,7 @@ static int handle_invite_replaces(struct sip_pvt *p, struct sip_request *req, in
* plan but tries to find the active call and masquerade
* into it
*/
static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int debug, int seqno, struct sockaddr_in *sin, int *recount, char *e)
static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int debug, int seqno, struct sockaddr_in *sin, int *recount, char *e, int *nounlock)
{
int res = 1;
int gotdest;
@@ -13636,6 +13636,7 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int
}
} else { /* Pickup call in call group */
ast_channel_unlock(c);
*nounlock = 1;
if (ast_pickup_call(c)) {
ast_log(LOG_NOTICE, "Nothing to pick up for %s\n", p->callid);
if (ast_test_flag(req, SIP_PKT_IGNORE))
@@ -14890,7 +14891,7 @@ static int handle_request(struct sip_pvt *p, struct sip_request *req, struct soc
res = handle_request_options(p, req);
break;
case SIP_INVITE:
res = handle_request_invite(p, req, debug, seqno, sin, recount, e);
res = handle_request_invite(p, req, debug, seqno, sin, recount, e, nounlock);
break;
case SIP_REFER:
res = handle_request_refer(p, req, debug, ignore, seqno, nounlock);