[asterisk-commits] tzafrir: branch 1.6.1 r261452 - in /branches/1.6.1: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: tzafrir
Date: Thu May  6 02:35:46 2010
New Revision: 261452

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=261452
Log:
Merged revisions 261451 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r261451 | tzafrir | 2010-05-06 10:27:31 +0300 (ה', 06 מאי 2010) | 4 lines
  
  When failing to configure, don't destroy 'cfg' twice
  
  Fixes a crash when some config section had an incorrect channel config.
........

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=261452&r1=261451&r2=261452
==============================================================================
--- branches/1.6.1/channels/chan_dahdi.c (original)
+++ branches/1.6.1/channels/chan_dahdi.c Thu May  6 02:35:46 2010
@@ -15304,7 +15304,7 @@
 			ast_mutex_unlock(&iflock);
 			ast_config_destroy(cfg);
 			if (ucfg) {
-				ast_config_destroy(cfg);
+				ast_config_destroy(ucfg);
 			}
 			return res;
 		}