diff options
| author | Russell Bryant <russell@russellbryant.com> | 2008-12-16 16:00:29 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2008-12-16 16:00:29 +0000 |
| commit | 36b1d08dc03b86d6ac4f9664557681aefd891a2d (patch) | |
| tree | 18977a1d207b3132db9fde6731e4097c7510c78b /channels | |
| parent | ec6e4d2f60cde68bacb5edada6cb749275a73719 (diff) | |
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
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index de7378fa0..520b696ab 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -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 */ |