diff options
| author | Walter Doekes <walter+asterisk@wjd.nu> | 2014-09-26 14:41:38 +0000 |
|---|---|---|
| committer | Walter Doekes <walter+asterisk@wjd.nu> | 2014-09-26 14:41:38 +0000 |
| commit | 37179a2b1f0a12e063a2bb300e402ac5e7512569 (patch) | |
| tree | 74872dbb405e8ef55370be0afe6bae8947a616da /addons/ooh323cDriver.c | |
| parent | b8c1130ed172e478d7eaccbf9ba2913aaf36b260 (diff) | |
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
Diffstat (limited to 'addons/ooh323cDriver.c')
| -rw-r--r-- | addons/ooh323cDriver.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/ooh323cDriver.c b/addons/ooh323cDriver.c index bceb07745..3096d1e07 100644 --- a/addons/ooh323cDriver.c +++ b/addons/ooh323cDriver.c @@ -121,7 +121,7 @@ void* ooh323c_call_thread(void* dummy) close(mycthread->thePipe[0]); close(mycthread->thePipe[1]); - free(mycthread); + ast_free(mycthread); ast_module_unref(myself); ast_update_use_count(); return NULL; @@ -155,7 +155,7 @@ int ooh323c_start_call_thread(ooCallData *call) { ast_module_ref(myself); if ((socketpair(PF_LOCAL, SOCK_STREAM, 0, cur->thePipe)) == -1) { ast_log(LOG_ERROR, "Can't create thread pipe for call %s\n", call->callToken); - free(cur); + ast_free(cur); return -1; } cur->inUse = TRUE; @@ -173,7 +173,7 @@ int ooh323c_start_call_thread(ooCallData *call) { ast_mutex_destroy(&cur->lock); close(cur->thePipe[0]); close(cur->thePipe[1]); - free(cur); + ast_free(cur); return -1; } |