From 46da169b6dcb36bd35177d69f492aa0ae750070e Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Sat, 21 Sep 2013 01:46:56 +0000
Subject: [PATCH] media_index: Fix process_description_file() memory leak of
file_id_persist. ........
Merged revisions 399596 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@399597 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
main/media_index.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/main/media_index.c b/main/media_index.c
index 943296ff4c..605cee927b 100644
--- a/main/media_index.c
+++ b/main/media_index.c
@@ -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 (file_id_persist && !ast_strlen_zero(ast_str_buffer(cumulative_description))) {
RAII_VAR(struct media_variant *, variant, NULL, ao2_cleanup);
+
variant = find_variant(index, file_id_persist, variant_str);
if (!variant) {
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_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);
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 */
if (file_id_persist && !ast_strlen_zero(ast_str_buffer(cumulative_description))) {
RAII_VAR(struct media_variant *, variant, NULL, ao2_cleanup);
+
variant = find_variant(index, file_id_persist, variant_str);
if (!variant) {
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) {
ast_string_field_set(variant, description, ast_str_buffer(cumulative_description));
- ast_free(file_id_persist);
} else {
res = -1;
}
}
+ ast_free(file_id_persist);
fclose(f);
return res;
}
--
GitLab