diff options
| author | Russell Bryant <russell@russellbryant.com> | 2007-06-06 21:16:18 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2007-06-06 21:16:18 +0000 |
| commit | 033a3df22aa68f04327066e0567b76f73c437651 (patch) | |
| tree | 04045bdee9d2bdd0272d9d82a6eb82b5e7c5ae74 | |
| parent | 65e8178c2b1ba845f089c5b782579e2d708c6add (diff) | |
Merged revisions 67862 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r67862 | russell | 2007-06-06 16:14:46 -0500 (Wed, 06 Jun 2007) | 4 lines
Fix a crash when doing call pickups with SIP phones. The code unlocked the
channel when it should not have.
(issue #9652, reported by corruptor, fixed by me)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67863 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | channels/chan_sip.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 6f7ccca50..d103ef743 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -1571,7 +1571,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 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); @@ -14151,7 +14151,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; @@ -14524,6 +14524,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)) @@ -15795,7 +15796,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, seqno, nounlock); |