automerge commit

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

diff --git a/cdr/cdr_odbc.c b/cdr/cdr_odbc.c
index 474ce4968ff61acbc78b01dac2699953627205ed..7a50bf21d0fa1ad4a6cecb752d72ed03105277eb 100644 (file)
--- a/cdr/cdr_odbc.c
+++ b/cdr/cdr_odbc.c
@@ -341,7 +341,6 @@ static int odbc_load_module(void)
                goto out;
        }
 
-       ast_config_destroy(cfg);
        if (option_verbose > 2) {
                ast_verbose( VERBOSE_PREFIX_3 "cdr_odbc: dsn is %s\n",dsn);
                if (username)
@@ -366,6 +365,8 @@ static int odbc_load_module(void)
                ast_log(LOG_ERROR, "cdr_odbc: Unable to register ODBC CDR handling\n");
        }
 out:
+       if (cfg)
+               ast_config_destroy(cfg);
        ast_mutex_unlock(&odbc_lock);
        return res;
 }