[svn-commits] russell: trunk r317868 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: russell
Date: Fri May  6 15:02:31 2011
New Revision: 317868

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=317868
Log:
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)
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=317868&r1=317867&r2=317868
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Fri May  6 15:02:31 2011
@@ -15582,7 +15582,8 @@
 		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);
 		}