From 72baa3968d8f9619a78cbea0c9de4b612adc2957 Mon Sep 17 00:00:00 2001
From: tzafrir <tzafrir@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Thu, 6 May 2010 07:35:46 +0000
Subject: Merged revisions 261451 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/trunk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

........
  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.
........


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@261452 f38db490-d61c-443f-a65b-d21fe96a405b
---
 channels/chan_dahdi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index e54a8d8b2..fca763998 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -15304,7 +15304,7 @@ static int setup_dahdi(int reload)
 			ast_mutex_unlock(&iflock);
 			ast_config_destroy(cfg);
 			if (ucfg) {
-				ast_config_destroy(cfg);
+				ast_config_destroy(ucfg);
 			}
 			return res;
 		}
-- 
cgit v1.2.3