kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

MALLOC_DEBUG: Fix some misuses of free() when MALLOC_DEBUG is enabled.

Browse Source 
* 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
This commit is contained in:
Richard Mudgett
2013-10-02 17:12:49 +00:00
parent d14869bcad
commit 97fcd6366d
6 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/json.c
View File

@@ -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;

4
main/stasis_cache.c
View File

@@ -448,10 +448,10 @@ struct stasis_caching_topic *stasis_caching_topic_create(struct stasis_topic *or
{
RAII_VAR(struct stasis_caching_topic *, caching_topic, NULL, ao2_cleanup);
struct stasis_subscription *sub;
RAII_VAR(char *, new_name, NULL, free);
RAII_VAR(char *, new_name, NULL, ast_free);
int ret;
ret = asprintf(&new_name, "%s-cached", stasis_topic_name(original_topic));
ret = ast_asprintf(&new_name, "%s-cached", stasis_topic_name(original_topic));
if (ret < 0) {
return NULL;
}

13
main/utils.c
View File

@@ -656,9 +656,10 @@ static void lock_info_destroy(void *data)
}
pthread_mutex_destroy(&lock_info->lock);
if (lock_info->thread_name)
free((void *) lock_info->thread_name);
free(lock_info);
if (lock_info->thread_name) {
ast_free((void *) lock_info->thread_name);
}
ast_free(lock_info);
}
/*!
@@ -2184,7 +2185,7 @@ int ast_mkdir(const char *path, int mode)
static int safe_mkdir(const char *base_path, char *path, int mode)
{
RAII_VAR(char *, absolute_path, NULL, free);
RAII_VAR(char *, absolute_path, NULL, ast_std_free);
absolute_path = realpath(path, NULL);
@@ -2206,7 +2207,7 @@ static int safe_mkdir(const char *base_path, char *path, int mode)
int res;
while (path_term) {
RAII_VAR(char *, absolute_subpath, NULL, free);
RAII_VAR(char *, absolute_subpath, NULL, ast_std_free);
/* Truncate the path one past the slash */
char c = *(path_term + 1);
@@ -2254,7 +2255,7 @@ static int safe_mkdir(const char *base_path, char *path, int mode)
int ast_safe_mkdir(const char *base_path, const char *path, int mode)
{
RAII_VAR(char *, absolute_base_path, NULL, free);
RAII_VAR(char *, absolute_base_path, NULL, ast_std_free);
RAII_VAR(char *, p, NULL, ast_free);
if (base_path == NULL || path == NULL) {