From: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
Date: Thu, 6 May 2010 07:35:46 +0000 (+0000)
Subject: Merged revisions 261451 via svnmerge from
X-Git-Tag: 1.6.1.20-rc1~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=960934b66ee4c625f77c89c73baddb055207178c;p=thirdparty%2Fasterisk.git

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@261452 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index e54a8d8b21..fca7639980 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;
 		}