diff options
author | Richard Mudgett <rmudgett@digium.com> | 2013-10-02 17:12:49 +0000 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2013-10-02 17:12:49 +0000 |
commit | 97fcd6366d128a8b9b176783743d66dbfab6e615 (patch) | |
tree | b70dfad6f2433b9b6a7cc7ee7455ab1585c66072 /apps/app_stack.c | |
parent | d14869bcadf719564436b252958a0a2a3ea27fd4 (diff) |
MALLOC_DEBUG: Fix some misuses of free() when MALLOC_DEBUG is enabled.
* There were several places in ARI where an external library was mallocing
memory that must always be released with free(). When MALLOC_DEBUG is
enabled, free() is redirected to the MALLOC_DEBUG version. Since the
external library call still uses the normal malloc(), MALLOC_DEBUG
complains that the freed memory block is not registered and will not free
it. These cases must use ast_std_free().
* Changed calls to asprintf() and vasprintf() to the equivalent
ast_asprintf() and ast_vasprintf() versions respectively.
........
Merged revisions 400270 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@400271 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_stack.c')
-rw-r--r-- | apps/app_stack.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/apps/app_stack.c b/apps/app_stack.c index fb665beb2..2199b3369 100644 --- a/apps/app_stack.c +++ b/apps/app_stack.c @@ -1215,8 +1215,7 @@ static int handle_gosub(struct ast_channel *chan, AGI *agi, int argc, const char ast_agi_send(agi->fd, chan, "200 result=%d Gosub failed\n", res); } - /* Must use free because the memory was allocated by asprintf(). */ - free(gosub_args); + ast_free(gosub_args); ast_channel_lock(chan); ast_debug(4, "%s Ending location: %s,%s,%d\n", ast_channel_name(chan), |