diff options
| author | David Vossel <dvossel@digium.com> | 2011-05-16 15:58:12 +0000 |
|---|---|---|
| committer | David Vossel <dvossel@digium.com> | 2011-05-16 15:58:12 +0000 |
| commit | 980d896bde167617c8763010cd6bd0e073c2a827 (patch) | |
| tree | 43247a0e80789ec15b8e0a57cdfe4e450b913657 /channels | |
| parent | 8e719c62b04d052b6d9b8f7f8745eab46e464255 (diff) | |
Merged revisions 319145 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r319145 | dvossel | 2011-05-16 10:57:26 -0500 (Mon, 16 May 2011) | 9 lines
Merged revisions 319144 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
........
r319144 | dvossel | 2011-05-16 10:56:16 -0500 (Mon, 16 May 2011) | 2 lines
Fixes issue with peer ref-counting during handle_request_subscribe.
(closes issue #19293)
Reported by: irroot
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@319146 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 099c8d2a1..e15eb7469 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -24033,7 +24033,7 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req, const char *unknown_acceptheader = NULL; if (authpeer) /* We do not need the authpeer any more */ - unref_peer(authpeer, "unref_peer, from handle_request_subscribe (authpeer 2)"); + authpeer = unref_peer(authpeer, "unref_peer, from handle_request_subscribe (authpeer 2)"); /* Header from Xten Eye-beam Accept: multipart/related, application/rlmi+xml, application/pidf+xml, application/xpidf+xml */ accept = __get_header(req, "Accept", &start); @@ -24164,9 +24164,10 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req, return 0; } - /* At this point, if we have an authpeer (which we have to have to get here) we should unref - * it since if we have actually used it, we have reffed it when p->relatedpeer was set. */ - authpeer = unref_peer(authpeer, "unref pointer into (*authpeer)"); + /* At this point, if we have an authpeer we should unref it. */ + if (authpeer) { + authpeer = unref_peer(authpeer, "unref pointer into (*authpeer)"); + } /* Add subscription for extension state from the PBX core */ if (p->subscribed != MWI_NOTIFICATION && p->subscribed != CALL_COMPLETION && !resubscribe) { |