mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-22 12:52:33 +00:00
core: Don't allow free to mean ast_free (and malloc, etc..).
This gets rid of most old libc free/malloc/realloc and replaces them with ast_free and friends. When compiling with MALLOC_DEBUG you'll notice it when you're mistakenly using one of the libc variants. For the legacy cases you can define WRAP_LIBC_MALLOC before including asterisk.h. Even better would be if the errors were also enabled when compiling without MALLOC_DEBUG, but that's a slightly more invasive header file change. Those compiling addons/format_mp3 will need to rerun ./contrib/scripts/get_mp3_source.sh. ASTERISK-24348 #related Review: https://reviewboard.asterisk.org/r/4015/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@423978 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
13
main/file.c
13
main/file.c
@@ -412,17 +412,12 @@ static void filestream_destructor(void *arg)
|
||||
}
|
||||
}
|
||||
|
||||
if (f->filename)
|
||||
free(f->filename);
|
||||
if (f->realfilename)
|
||||
free(f->realfilename);
|
||||
ast_free(f->filename);
|
||||
ast_free(f->realfilename);
|
||||
if (f->vfs)
|
||||
ast_closestream(f->vfs);
|
||||
if (f->write_buffer) {
|
||||
ast_free(f->write_buffer);
|
||||
}
|
||||
if (f->orig_chan_name)
|
||||
free((void *) f->orig_chan_name);
|
||||
ast_free(f->write_buffer);
|
||||
ast_free((void *)f->orig_chan_name);
|
||||
ao2_cleanup(f->lastwriteformat);
|
||||
ao2_cleanup(f->fr.subclass.format);
|
||||
ast_module_unref(f->fmt->module);
|
||||
|
Reference in New Issue
Block a user