Index: cdr/cdr_pgsql.c
===================================================================
--- cdr/cdr_pgsql.c	(revision 67164)
+++ cdr/cdr_pgsql.c	(working copy)
@@ -184,17 +184,17 @@
 	if (conn)
 		PQfinish(conn);
 	if (pghostname)
-		free(pghostname);
+		ast_free(pghostname);
 	if (pgdbname)
-		free(pgdbname);
+		ast_free(pgdbname);
 	if (pgdbuser)
-		free(pgdbuser);
+		ast_free(pgdbuser);
 	if (pgpassword)
-		free(pgpassword);
+		ast_free(pgpassword);
 	if (pgdbport)
-		free(pgdbport);
+		ast_free(pgdbport);
 	if (table)
-		free(table);
+		ast_free(table);
 	ast_cdr_unregister(name);
 	return 0;
 }
Index: cdr/cdr_odbc.c
===================================================================
--- cdr/cdr_odbc.c	(revision 67164)
+++ cdr/cdr_odbc.c	(working copy)
@@ -218,22 +218,22 @@
 	if (dsn) {
 		if (option_verbose > 10)
 			ast_verbose( VERBOSE_PREFIX_4 "cdr_odbc: free dsn\n");
-		free(dsn);
+		ast_free(dsn);
 	}
 	if (username) {
 		if (option_verbose > 10)
 			ast_verbose( VERBOSE_PREFIX_4 "cdr_odbc: free username\n");
-		free(username);
+		ast_free(username);
 	}
 	if (password) {
 		if (option_verbose > 10)
 			ast_verbose( VERBOSE_PREFIX_4 "cdr_odbc: free password\n");
-		free(password);
+		ast_free(password);
 	}
 	if (table) {
 		if (option_verbose > 10)
 			ast_verbose( VERBOSE_PREFIX_4 "cdr_odbc: free table\n");
-		free(table);
+		ast_free(table);
 	}
 
 	ast_cdr_unregister(name);
Index: cdr/cdr_tds.c
===================================================================
--- cdr/cdr_tds.c	(revision 67164)
+++ cdr/cdr_tds.c	(working copy)
@@ -221,16 +221,16 @@
 		}
 	} while (!connected && !retried);
 
-	free(accountcode);
-	free(src);
-	free(dst);
-	free(dcontext);
-	free(clid);
-	free(channel);
-	free(dstchannel);
-	free(lastapp);
-	free(lastdata);
-	free(uniqueid);
+	ast_free(accountcode);
+	ast_free(src);
+	ast_free(dst);
+	ast_free(dcontext);
+	ast_free(clid);
+	ast_free(channel);
+	ast_free(dstchannel);
+	ast_free(lastapp);
+	ast_free(lastdata);
+	ast_free(uniqueid);
 
 	ast_mutex_unlock(&tds_lock);
 
@@ -246,7 +246,7 @@
 	char *known_bad[] = {"select", "insert", "update", "delete", "drop", ";", "--", "\0"};
 	int idx;
 
-	if ((buf = malloc(len + 1)) == NULL)
+	if ((buf = ast_malloc(len + 1)) == NULL)
 	{
 		ast_log(LOG_ERROR, "cdr_tds:  Out of memory error\n");
 		return NULL;
@@ -413,13 +413,13 @@
 
 	ast_cdr_unregister(name);
 
-	if (hostname) free(hostname);
-	if (dbname) free(dbname);
-	if (dbuser) free(dbuser);
-	if (password) free(password);
-	if (charset) free(charset);
-	if (language) free(language);
-	if (table) free(table);
+	if (hostname) ast_free(hostname);
+	if (dbname) ast_free(dbname);
+	if (dbuser) ast_free(dbuser);
+	if (password) ast_free(password);
+	if (charset) ast_free(charset);
+	if (language) ast_free(language);
+	if (table) ast_free(table);
 
 	return 0;
 }
Index: cdr/cdr_sqlite.c
===================================================================
--- cdr/cdr_sqlite.c	(revision 67164)
+++ cdr/cdr_sqlite.c	(working copy)
@@ -161,7 +161,7 @@
 	
 	if (zErr) {
 		ast_log(LOG_ERROR, "cdr_sqlite: %s\n", zErr);
-		free(zErr);
+		ast_free(zErr);
 	}
 
 	ast_mutex_unlock(&sqlite_lock);
@@ -190,7 +190,7 @@
 	db = sqlite_open(fn, AST_FILE_MODE, &zErr);
 	if (!db) {
 		ast_log(LOG_ERROR, "cdr_sqlite: %s\n", zErr);
-		free(zErr);
+		ast_free(zErr);
 		return -1;
 	}
 
@@ -200,7 +200,7 @@
 		res = sqlite_exec(db, sql_create_table, NULL, NULL, &zErr);
 		if (res) {
 			ast_log(LOG_ERROR, "cdr_sqlite: Unable to create table 'cdr': %s\n", zErr);
-			free(zErr);
+			ast_free(zErr);
 			goto err;
 		}
 
Index: cdr/cdr_adaptive_odbc.c
===================================================================
--- cdr/cdr_adaptive_odbc.c	(revision 67164)
+++ cdr/cdr_adaptive_odbc.c	(working copy)
@@ -211,7 +211,7 @@
 		if (AST_LIST_FIRST(&(tableptr->columns)))
 			AST_RWLIST_INSERT_TAIL(&odbc_tables, tableptr, list);
 		else
-			free(tableptr);
+			ast_free(tableptr);
 	}
 	return res;
 }