[asterisk-commits] jpeeler: trunk r222351 - /trunk/channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Tue Oct  6 15:35:19 2009
New Revision: 222351

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=222351
Log:
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:
    trunk/channels/chan_dahdi.c

Modified: trunk/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=222351&r1=222350&r2=222351
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Tue Oct  6 15:35:19 2009
@@ -4881,7 +4881,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);
@@ -11309,7 +11309,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;