mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-17 07:18:15 +00:00
Merged revisions 334954 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r334954 | rmudgett | 2011-09-08 17:28:56 -0500 (Thu, 08 Sep 2011) | 17 lines 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/trunk@334955 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -1666,7 +1666,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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user