From: Russell Bryant <russell@russellbryant.com>
Date: Fri, 6 May 2011 20:02:31 +0000 (+0000)
Subject: Merged revisions 317867 via svnmerge from
X-Git-Tag: 11.0.0-beta1~1606
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33b7cc2ef6e686637e0c3d294ee90b5e2e7dd7e1;p=thirdparty%2Fasterisk.git

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index eeff8905a0..36866baa52 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);
 		}