diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-06 19:27:31 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-06 19:27:31 +0000 |
| commit | 3fa13df74a68811553dd66dfa2f9035973428f08 (patch) | |
| tree | 01ede17e9b4aa2f9de2d33ba68ed45e24f78d8d4 /channels | |
| parent | b5258a55e09617929a9de802e4c2076a22bc2d75 (diff) | |
Merged revisions 222298 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r222298 | jpeeler | 2009-10-06 14:24:59 -0500 (Tue, 06 Oct 2009) | 9 lines
Fix crash during destruction of second channel when variable set with setvar.
The setvar line in chan_dahdi.conf is shared among all the channels, so make
sure to only free the resources only when the last channel is destroyed.
(closes issue #15899)
Reported by: tzafrir
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@222304 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_dahdi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index b5609691e..6847cad56 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -3859,8 +3859,9 @@ 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) + if (p->vars && iflist && !iflist->next) { ast_variables_destroy(p->vars); + } ast_mutex_destroy(&p->lock); dahdi_close_sub(p, SUB_REAL); if (p->owner) |