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 /res/res_phoneprov.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 'res/res_phoneprov.c')
| -rw-r--r-- | res/res_phoneprov.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/res_phoneprov.c b/res/res_phoneprov.c index e9a6b8fb4..b8b52787d 100644 --- a/res/res_phoneprov.c +++ b/res/res_phoneprov.c @@ -272,7 +272,7 @@ static int profile_cmp_fn(void *obj, void *arg, int flags) static void delete_file(struct phoneprov_file *file) { ast_string_field_free_memory(file); - free(file); + ast_free(file); } static void profile_destructor(void *obj) @@ -340,7 +340,7 @@ static int load_file(const char *filename, char **ret) return -2; if (len != fread(*ret, sizeof(char), len, f)) { - free(*ret); + ast_free(*ret); *ret = NULL; return -3; } |