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 /apps | |
| 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 'apps')
| -rw-r--r-- | apps/app_jack.c | 4 | ||||
| -rw-r--r-- | apps/app_queue.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/app_jack.c b/apps/app_jack.c index 8d404318b..a4e47267e 100644 --- a/apps/app_jack.c +++ b/apps/app_jack.c @@ -497,7 +497,7 @@ static int init_jack_data(struct ast_channel *chan, struct jack_data *jack_data) jack_port_name(jack_data->output_port)); } - free((void *) ports); + jack_free(ports); break; } @@ -528,7 +528,7 @@ static int init_jack_data(struct ast_channel *chan, struct jack_data *jack_data) jack_port_name(jack_data->input_port)); } - free((void *) ports); + jack_free(ports); break; } diff --git a/apps/app_queue.c b/apps/app_queue.c index 230dcd047..9647fcdbf 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -3232,7 +3232,7 @@ static void destroy_queue(void *obj) ast_string_field_free_memory(q); for (i = 0; i < MAX_PERIODIC_ANNOUNCEMENTS; i++) { if (q->sound_periodicannounce[i]) { - free(q->sound_periodicannounce[i]); + ast_free(q->sound_periodicannounce[i]); } } ao2_ref(q->members, -1); |