[asterisk-commits] jpeeler: branch 1.6.0 r222352 - in /branches/1.6.0: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Tue Oct  6 15:36:09 2009
New Revision: 222352

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=222352
Log:
Merged revisions 222351 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r222351 | jpeeler | 2009-10-06 15:35:19 -0500 (Tue, 06 Oct 2009) | 9 lines
  
  Fix 222298 (crash during destruction of second channel when variable set with
  setvar).
  
  I mistakenly reasoned that setvar would be used on all channels. Since it can
  be set per channel, give each dahdi channel a copy of the variable.
  
  (related to #15899)
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_dahdi.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/channels/chan_dahdi.c?view=diff&rev=222352&r1=222351&r2=222352
==============================================================================
--- branches/1.6.0/channels/chan_dahdi.c (original)
+++ branches/1.6.0/channels/chan_dahdi.c Tue Oct  6 15:36:09 2009
@@ -3137,7 +3137,7 @@
 		ast_smdi_interface_unref(p->smdi_iface);
 	if (p->mwi_event_sub)
 		ast_event_unsubscribe(p->mwi_event_sub);
-	if (p->vars && iflist && !iflist->next) {
+	if (p->vars) {
 		ast_variables_destroy(p->vars);
 	}
 	ast_mutex_destroy(&p->lock);
@@ -8991,7 +8991,7 @@
 		tmp->callgroup = conf->chan.callgroup;
 		tmp->pickupgroup= conf->chan.pickupgroup;
 		if (conf->chan.vars) {
-			tmp->vars = conf->chan.vars;
+			tmp->vars = ast_variable_new(conf->chan.vars->name, conf->chan.vars->value, "");
 		}
 		tmp->cid_rxgain = conf->chan.cid_rxgain;
 		tmp->rxgain = conf->chan.rxgain;