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 /main/json.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 'main/json.c')
| -rw-r--r-- | main/json.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/json.c b/main/json.c index 5e50c424a..e3ef3d001 100644 --- a/main/json.c +++ b/main/json.c @@ -340,10 +340,10 @@ struct ast_json *ast_json_vstringf(const char *format, va_list args) json_t *ret = NULL; if (format) { - int err = vasprintf(&str, format, args); + int err = ast_vasprintf(&str, format, args); if (err > 0) { ret = json_string(str); - free(str); + ast_free(str); } } return (struct ast_json *)ret; |