[svn-commits] file: trunk r45929 - in /trunk: ./ cdr/cdr_odbc.c

[svn-commits at lists.digium.com]

Author: file
Date: Sun Oct 22 19:33:20 2006
New Revision: 45929

URL: http://svn.digium.com/view/asterisk?rev=45929&view=rev
Log:
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?

........

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

Modified:
    trunk/   (props changed)
    trunk/cdr/cdr_odbc.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/cdr/cdr_odbc.c
URL: http://svn.digium.com/view/asterisk/trunk/cdr/cdr_odbc.c?rev=45929&r1=45928&r2=45929&view=diff
==============================================================================
--- trunk/cdr/cdr_odbc.c (original)
+++ trunk/cdr/cdr_odbc.c Sun Oct 22 19:33:20 2006
@@ -346,7 +346,6 @@
 		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 @@
 		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;
 }