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 /channels | |
| 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 'channels')
| -rw-r--r-- | channels/chan_console.c | 2 | ||||
| -rw-r--r-- | channels/chan_mgcp.c | 6 | ||||
| -rw-r--r-- | channels/chan_skinny.c | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/channels/chan_console.c b/channels/chan_console.c index c34a6c45d..7ddbcf0e3 100644 --- a/channels/chan_console.c +++ b/channels/chan_console.c @@ -860,7 +860,7 @@ static char *cli_console_dial(struct ast_cli_entry *e, int cmd, struct ast_cli_a } else ast_cli(a->fd, "No such extension '%s' in context '%s'\n", mye, myc); - free(s); + ast_free(s); unref_pvt(pvt); diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index c72df663b..0f6b916c1 100644 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -3812,7 +3812,7 @@ static int mgcp_prune_realtime_gateway(struct mgcp_gateway *g) if (prune) { ast_mutex_destroy(&s->lock); ast_mutex_destroy(&s->cx_queue_lock); - free(s); + ast_free(s); } } ast_mutex_unlock(&e->lock); @@ -3822,7 +3822,7 @@ static int mgcp_prune_realtime_gateway(struct mgcp_gateway *g) ast_mutex_destroy(&e->lock); ast_mutex_destroy(&e->rqnt_queue_lock); ast_mutex_destroy(&e->cmd_queue_lock); - free(e); + ast_free(e); } } if (prune) { @@ -3914,7 +3914,7 @@ static void *do_monitor(void *data) } ast_mutex_unlock(&g->msgs_lock); ast_mutex_destroy(&g->msgs_lock); - free(g); + ast_free(g); } else { ast_mutex_unlock(&g->msgs_lock); gprev = g; diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index a04a63bab..1cfb3a765 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -8540,16 +8540,16 @@ static void delete_devices(void) } /* Delete all speeddials for this device */ while ((sd = AST_LIST_REMOVE_HEAD(&d->speeddials, list))) { - free(sd->container); - free(sd); + ast_free(sd->container); + ast_free(sd); } /* Delete all serviceurls for this device */ while ((surl = AST_LIST_REMOVE_HEAD(&d->serviceurls, list))) { - free(surl); + ast_free(surl); } /* Delete all addons for this device */ while ((a = AST_LIST_REMOVE_HEAD(&d->addons, list))) { - free(a); + ast_free(a); } d = skinny_device_destroy(d); } @@ -8603,11 +8603,11 @@ int skinny_reload(void) } /* Delete all speeddials for this device */ while ((sd = AST_LIST_REMOVE_HEAD(&d->speeddials, list))) { - free(sd); + ast_free(sd); } /* Delete all addons for this device */ while ((a = AST_LIST_REMOVE_HEAD(&d->addons, list))) { - free(a); + ast_free(a); } AST_LIST_REMOVE_CURRENT(list); d = skinny_device_destroy(d); |