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 /main/app.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 'main/app.c')
| -rw-r--r-- | main/app.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/main/app.c b/main/app.c index a6c7514cd..fd19beeaf 100644 --- a/main/app.c +++ b/main/app.c @@ -1892,7 +1892,7 @@ int ast_app_group_set_channel(struct ast_channel *chan, const char *data) AST_RWLIST_TRAVERSE_SAFE_BEGIN(&groups, gi, group_list) { if ((gi->chan == chan) && ((ast_strlen_zero(category) && ast_strlen_zero(gi->category)) || (!ast_strlen_zero(gi->category) && !strcasecmp(gi->category, category)))) { AST_RWLIST_REMOVE_CURRENT(group_list); - free(gi); + ast_free(gi); break; } } @@ -1900,7 +1900,7 @@ int ast_app_group_set_channel(struct ast_channel *chan, const char *data) if (ast_strlen_zero(group)) { /* Enable unsetting the group */ - } else if ((gi = calloc(1, len))) { + } else if ((gi = ast_calloc(1, len))) { gi->chan = chan; gi->group = (char *) gi + sizeof(*gi); strcpy(gi->group, group); @@ -2176,9 +2176,9 @@ static void path_lock_destroy(struct path_lock *obj) close(obj->fd); } if (obj->path) { - free(obj->path); + ast_free(obj->path); } - free(obj); + ast_free(obj); } static enum AST_LOCK_RESULT ast_lock_path_flock(const char *path) @@ -2222,7 +2222,7 @@ static enum AST_LOCK_RESULT ast_lock_path_flock(const char *path) return AST_LOCK_FAILURE; } pl->fd = fd; - pl->path = strdup(path); + pl->path = ast_strdup(path); time(&start); while ( |