From: Joshua Colp <jcolp@digium.com>
Date: Mon, 23 Oct 2006 00:33:20 +0000 (+0000)
Subject: Merged revisions 45928 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~4313
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68ccfe6e5e9cfdc8e0777b8a2d5e38cb4a4c37fd;p=thirdparty%2Fasterisk.git

Merged revisions 45928 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r45928 | file | 2006-10-22 20:27:39 -0400 (Sun, 22 Oct 2006) | 10 lines

Merged revisions 45927 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r45927 | file | 2006-10-22 20:25:28 -0400 (Sun, 22 Oct 2006) | 2 lines

Don't leak memory mmmk?

........

................


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

diff --git a/cdr/cdr_odbc.c b/cdr/cdr_odbc.c
index f916a8d852..79ea1453af 100644
--- a/cdr/cdr_odbc.c
+++ b/cdr/cdr_odbc.c
@@ -346,7 +346,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)
@@ -371,6 +370,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;
 }