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.
........

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

diff --git a/main/logger.c b/main/logger.c
index 209f374e60259ea83fc8a5a491eace95585c9ea4..63c3d26f5c98950281417c6e57b9991a6e228d92 100644 (file)
--- a/main/logger.c
+++ b/main/logger.c
@@ -1652,7 +1652,7 @@ void ast_logger_unregister_level(const char *name)
 
                global_logmask &= ~(1 << x);
 
-               free(levels[x]);
+               ast_free(levels[x]);
                levels[x] = NULL;
                AST_RWLIST_UNLOCK(&logchannels);