aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_sip.c
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2011-05-06 20:02:31 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2011-05-06 20:02:31 +0000
commitdd2f4c198a432e1fb35a85734563c4f4cabf0601 (patch)
treea398fd1feb52d3d77650139b0b90e75c1aaaf940 /channels/chan_sip.c
parentd95833ef8ab1f606e0a26e505edb7c7f70926c66 (diff)
Merged revisions 317867 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r317867 | russell | 2011-05-06 15:01:16 -0500 (Fri, 06 May 2011) | 10 lines chan_sip: Destroy variables on a sip_pvt before copying vars from the sip_peer. Don't duplicate variables on the sip_pvt. Just reset the variable list each time. (closes issue #19202) Reported by: wdoekes Patches: issue19202_destroy_challenged_invite_chanvars.patch uploaded by wdoekes (license 717) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317868 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_sip.c')
-rw-r--r--channels/chan_sip.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index eeff8905a..36866baa5 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -15582,7 +15582,8 @@ static enum check_auth_result check_peer_ok(struct sip_pvt *p, char *of,
ast_string_field_set(p, authname, peer->name);
if (sipmethod == SIP_INVITE) {
- /* copy channel vars */
+ /* destroy old channel vars and copy in new ones. */
+ ast_variables_destroy(p->chanvars);
p->chanvars = copy_vars(peer->chanvars);
}