Fix 222298 (crash during destruction of second channel when variable set with
authorJeff Peeler <jpeeler@digium.com>
Tue, 6 Oct 2009 20:35:19 +0000 (20:35 +0000)
committerJeff Peeler <jpeeler@digium.com>
Tue, 6 Oct 2009 20:35:19 +0000 (20:35 +0000)
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/trunk@222351 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_dahdi.c

index 0af7d7d..a97ff58 100644 (file)
@@ -4881,7 +4881,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);
@@ -11309,7 +11309,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;