dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

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/trunk@222351 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
jpeeler 2009-10-06 20:35:19 +00:00
parent 5c7b85b039
commit 41e7baf28b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
channels/chan_dahdi.c
View 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;