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/app_mysql.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/app_mysql.c')
| -rw-r--r-- | addons/app_mysql.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/app_mysql.c b/addons/app_mysql.c index 298ed9d65..6901daf05 100644 --- a/addons/app_mysql.c +++ b/addons/app_mysql.c @@ -218,7 +218,7 @@ static int add_identifier(struct ast_channel *chan, int identifier_type, void *d ast_log(LOG_WARNING, "Unable to lock identifiers list\n"); return -1; } else { - i = malloc(sizeof(*i)); + i = ast_malloc(sizeof(*i)); AST_LIST_TRAVERSE(headp, j, entries) { if (j->identifier > maxidentifier) { maxidentifier = j->identifier; @@ -247,7 +247,7 @@ static int del_identifier(int identifier, int identifier_type) if ((i->identifier == identifier) && (i->identifier_type == identifier_type)) { AST_LIST_REMOVE(headp, i, entries); - free(i); + ast_free(i); found = 1; break; } |