]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Fix crash with res_fax when MALLOC_DEBUG and "core stop gracefully" are used.
authorRichard Mudgett <rmudgett@digium.com>
Thu, 8 Sep 2011 22:27:40 +0000 (22:27 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Thu, 8 Sep 2011 22:27:40 +0000 (22:27 +0000)
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/1.8@334953 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/logger.c

index 0e0d2a0b33761c42b034095902ef30061ad53ef3..017edca09ae0f7aa8e48b26137e088cf0ca317bd 100644 (file)
@@ -1661,7 +1661,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);