kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 18:40:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

media_index: Fix process_description_file() memory leak of file_id_persist.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@399596 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2013-09-21 01:46:16 +00:00
parent dd3acf4f57
commit 1577e10111
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
main/media_index.c
View File

@@ -439,6 +439,7 @@ static int process_description_file(struct ast_media_index *index,
/* if there's text in cumulative_description, archive it and start anew */ /* if there's text in cumulative_description, archive it and start anew */
if (file_id_persist && !ast_strlen_zero(ast_str_buffer(cumulative_description))) { if (file_id_persist && !ast_strlen_zero(ast_str_buffer(cumulative_description))) {
RAII_VAR(struct media_variant *, variant, NULL, ao2_cleanup); RAII_VAR(struct media_variant *, variant, NULL, ao2_cleanup);
variant = find_variant(index, file_id_persist, variant_str); variant = find_variant(index, file_id_persist, variant_str);
if (!variant) { if (!variant) {
variant = alloc_variant(index, file_id_persist, variant_str); variant = alloc_variant(index, file_id_persist, variant_str);
@@ -451,11 +452,10 @@ static int process_description_file(struct ast_media_index *index,
ast_string_field_set(variant, description, ast_str_buffer(cumulative_description)); ast_string_field_set(variant, description, ast_str_buffer(cumulative_description));
ast_str_reset(cumulative_description); ast_str_reset(cumulative_description);
ast_free(file_id_persist);
file_id_persist = NULL;
} }
file_id_persist = strdup(file_identifier); ast_free(file_id_persist);
file_id_persist = ast_strdup(file_identifier);
description = ast_skip_blanks(description); description = ast_skip_blanks(description);
ast_str_set(&cumulative_description, 0, "%s", description); ast_str_set(&cumulative_description, 0, "%s", description);
} }
@@ -464,6 +464,7 @@ static int process_description_file(struct ast_media_index *index,
/* handle the last one */ /* handle the last one */
if (file_id_persist && !ast_strlen_zero(ast_str_buffer(cumulative_description))) { if (file_id_persist && !ast_strlen_zero(ast_str_buffer(cumulative_description))) {
RAII_VAR(struct media_variant *, variant, NULL, ao2_cleanup); RAII_VAR(struct media_variant *, variant, NULL, ao2_cleanup);
variant = find_variant(index, file_id_persist, variant_str); variant = find_variant(index, file_id_persist, variant_str);
if (!variant) { if (!variant) {
variant = alloc_variant(index, file_id_persist, variant_str); variant = alloc_variant(index, file_id_persist, variant_str);
@@ -471,12 +472,12 @@ static int process_description_file(struct ast_media_index *index,
if (variant) { if (variant) {
ast_string_field_set(variant, description, ast_str_buffer(cumulative_description)); ast_string_field_set(variant, description, ast_str_buffer(cumulative_description));
ast_free(file_id_persist);
} else { } else {
res = -1; res = -1;
} }
} }
ast_free(file_id_persist);
fclose(f); fclose(f);
return res; return res;
} }