From 6a539ace84035883c6f95eee21f5072a9f8fe812 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Tue, 21 Aug 2012 21:01:11 +0000 Subject: Fix misuses of asprintf throughout the code. This fixes three main issues * Change asprintf() uses to ast_asprintf() so that it pairs properly with ast_free() and no longer causes MALLOC_DEBUG to freak out. * When ast_asprintf() fails, set the pointer NULL if it will be referenced later. * Fix some memory leaks that were spotted while taking care of the first two points. (Closes issue ASTERISK-20135) reported by Richard Mudgett Review: https://reviewboard.asterisk.org/r/2071 ........ Merged revisions 371590 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 371591 from http://svn.asterisk.org/svn/asterisk/branches/10 ........ Merged revisions 371592 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@371593 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- cdr/cdr_tds.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cdr/cdr_tds.c') diff --git a/cdr/cdr_tds.c b/cdr/cdr_tds.c index eead023fb..dd75dbb46 100644 --- a/cdr/cdr_tds.c +++ b/cdr/cdr_tds.c @@ -360,11 +360,11 @@ static int execute_and_consume(DBPROCESS *dbproc, const char *fmt, ...) va_end(ap); if (dbfcmd(dbproc, buffer) == FAIL) { - free(buffer); + ast_free(buffer); return 1; } - free(buffer); + ast_free(buffer); if (dbsqlexec(dbproc) == FAIL) { return 1; -- cgit v1.2.3