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/trunk@164675 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
ec6e4d2f60
commit
36b1d08dc0
1 changed files with 5 additions and 2 deletions
|
@ -12704,8 +12704,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 */
|
||||
|
|
Loading…
Reference in a new issue