diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-06 20:36:41 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-06 20:36:41 +0000 |
| commit | f4e97a316393021ddda412b07beffcaadcfa1701 (patch) | |
| tree | a012a960be61bcacdecd48cd12154e0994960ddf /channels | |
| parent | 044c9a62f408b242c8222c1300aa9fe2fb5104ce (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@222353 f38db490-d61c-443f-a65b-d21fe96a405b
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 11dcf9269..fc88cb774 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -3152,7 +3152,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); @@ -9178,7 +9178,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; |