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 e54a8d8b2185d96bb4de173b8d905554eac3773f..fca7639980ce5514ab9e0cde2a4d071e12ec4cce 100644 (file)
--- 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;
                }