diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-16 15:56:37 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-16 15:56:37 +0000 |
| commit | 04d03a5a078adb1eaa2b2d6e316bf2343e91c300 (patch) | |
| tree | 753f584e672368d2437a2caa7ac8f20bcf58f4cc | |
| parent | 2289ddaea5a6f4074f8cb5a95961be471f5ddae9 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.4@164672 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 19cc9fd6a..d478892da 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -9566,11 +9566,13 @@ static enum check_auth_result check_user_full(struct sip_pvt *p, struct sip_requ if (user && ast_apply_ha(user->ha, sin)) { ast_copy_flags(&p->flags[0], &user->flags[0], SIP_FLAGS_TO_COPY); ast_copy_flags(&p->flags[1], &user->flags[1], SIP_PAGE2_FLAGS_TO_COPY); - /* copy channel vars */ - for (v = user->chanvars ; v ; v = v->next) { - if ((tmpvar = ast_variable_new(v->name, v->value))) { - tmpvar->next = p->chanvars; - p->chanvars = tmpvar; + if (sipmethod == SIP_INVITE) { + /* copy channel vars */ + for (v = user->chanvars ; v ; v = v->next) { + if ((tmpvar = ast_variable_new(v->name, v->value))) { + tmpvar->next = p->chanvars; + p->chanvars = tmpvar; + } } } p->prefs = user->prefs; @@ -9724,11 +9726,13 @@ static enum check_auth_result check_user_full(struct sip_pvt *p, struct sip_requ ast_string_field_set(p, peername, peer->name); ast_string_field_set(p, authname, peer->name); - /* copy channel vars */ - for (v = peer->chanvars ; v ; v = v->next) { - if ((tmpvar = ast_variable_new(v->name, v->value))) { - tmpvar->next = p->chanvars; - p->chanvars = tmpvar; + if (sipmethod == SIP_INVITE) { + /* copy channel vars */ + for (v = peer->chanvars ; v ; v = v->next) { + if ((tmpvar = ast_variable_new(v->name, v->value))) { + tmpvar->next = p->chanvars; + p->chanvars = tmpvar; + } } } if (authpeer) { |