From fd4e74634e13467e2586e59e7d774043e6330a47 Mon Sep 17 00:00:00 2001 From: Jeff Peeler Date: Tue, 6 Oct 2009 20:37:48 +0000 Subject: [PATCH] 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) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@222354 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_dahdi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 6847cad56d..588be0d5a0 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -3859,7 +3859,7 @@ static void destroy_dahdi_pvt(struct dahdi_pvt **pvt) 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); @@ -10499,7 +10499,7 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf, 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;