From: Russell Bryant <russell@russellbryant.com>
Date: Fri, 6 May 2011 20:01:16 +0000 (+0000)
Subject: chan_sip: Destroy variables on a sip_pvt before copying vars from the sip_peer.
X-Git-Tag: 1.8.5-rc1~11^2~141
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c6e7632586ea556f53968b152d4a0604b9c87da;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.8@317867 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index ca5dc72c97..c158bee25f 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -15324,7 +15324,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);
 		}