[asterisk-commits] rmudgett: branch 10 r334954 - in /branches/10: ./ main/logger.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu Sep  8 17:28:56 2011
New Revision: 334954

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=334954
Log:
Merged revisions 334953 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r334953 | rmudgett | 2011-09-08 17:27:40 -0500 (Thu, 08 Sep 2011) | 10 lines
  
  Fix crash with res_fax when MALLOC_DEBUG and "core stop gracefully" are used.
  
  Asterisk crashes if MALLOC_DEBUG is enabled when res_fax tries to
  unregister its logger level.
  
  * Make ast_logger_unregister_level() use ast_free() instead of free().
  When MALLOC_DEBUG is enabled, ast_free() does not degenerate into a call
  to free().  Therefore, if you allocated memory with a form of ast_malloc
  you must free it with ast_free.
........

Modified:
    branches/10/   (props changed)
    branches/10/main/logger.c

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/main/logger.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/main/logger.c?view=diff&rev=334954&r1=334953&r2=334954
==============================================================================
--- branches/10/main/logger.c (original)
+++ branches/10/main/logger.c Thu Sep  8 17:28:56 2011
@@ -1652,7 +1652,7 @@
 
 		global_logmask &= ~(1 << x);
 
-		free(levels[x]);
+		ast_free(levels[x]);
 		levels[x] = NULL;
 		AST_RWLIST_UNLOCK(&logchannels);