diff options
| author | Jeff Peeler <jpeeler@digium.com> | 2009-10-06 20:35:19 +0000 |
|---|---|---|
| committer | Jeff Peeler <jpeeler@digium.com> | 2009-10-06 20:35:19 +0000 |
| commit | f7fa41713000f823d48be89fb80ead553ed8f739 (patch) | |
| tree | f2091cb2e418f9dc1abbc6eeef12a0850526ba4e /channels | |
| parent | 2d60b755949c011932c554820e135aa95e154215 (diff) | |
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/trunk@222351 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_dahdi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 0af7d7d4b..a97ff5837 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -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; |