[svn-commits] jpeeler: branch 1.6.1 r222303 - in /branches/1.6.1: ./ channels/chan_dahdi.c

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Tue Oct  6 14:26:57 2009
New Revision: 222303

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=222303
Log:
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
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_dahdi.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/channels/chan_dahdi.c?view=diff&rev=222303&r1=222302&r2=222303
==============================================================================
--- branches/1.6.1/channels/chan_dahdi.c (original)
+++ branches/1.6.1/channels/chan_dahdi.c Tue Oct  6 14:26:57 2009
@@ -3152,8 +3152,9 @@
 		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)