kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 19:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 164675 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
r164675 | russell | 2008-12-16 10:00:29 -0600 (Tue, 16 Dec 2008) | 19 lines

Merged revisions 164672 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r164672 | russell | 2008-12-16 09:56:37 -0600 (Tue, 16 Dec 2008) | 11 lines

Fix a memory leak related to the use of the "setvar" configuration option.

The problem was that these variables were being appended to the list of vars
on the sip_pvt every time a re-registration or re-subscription came in.
Since it's just a waste of memory to put them there unless the request was an
INVITE, then the fix is to check the request type before copying the vars.

(closes issue #14037)
Reported by: marvinek
Tested by: russell

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@164677 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2008-12-16 16:03:45 +00:00
parent d2b0a64b61
commit 072033cdb0
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
channels/chan_sip.c
View File

@@ -11989,8 +11989,11 @@ static enum check_auth_result check_peer_ok(struct sip_pvt *p, char *of,
ast_string_field_set(p, peername, peer->name);
ast_string_field_set(p, authname, peer->name);
/* copy channel vars */
p->chanvars = copy_vars(peer->chanvars);
if (sipmethod == SIP_INVITE) {
/* copy channel vars */
p->chanvars = copy_vars(peer->chanvars);
}
if (authpeer) {
ao2_t_ref(peer, 1, "copy pointer into (*authpeer)");
(*authpeer) = peer; /* Add a ref to the object here, to keep it in memory a bit longer if it is realtime */