summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-09-07 19:25:22 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-09-21 04:31:33 +0200
commit7369e952676595b1ccf1e707e741f6c1f05481aa (patch)
treec52a8ab2c157bd77e3df9dddc47079f07bc8e1fd /libavformat
parent17963a6ad7e41312312b32a4ce590abb9805f799 (diff)
avformat/dashdec: Free strings as soon as they aren't needed anymore
Reviewed-by: Steven Liu <lq@chinaffmpeg.org> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/dashdec.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c
index 3f51e079cf..8b421a4493 100644
--- a/libavformat/dashdec.c
+++ b/libavformat/dashdec.c
@@ -616,9 +616,9 @@ static int parse_manifest_segmenturlnode(AVFormatContext *s, struct representati
if (initialization_val || range_val) {
free_fragment(&rep->init_section);
rep->init_section = get_Fragment(range_val);
+ xmlFree(range_val);
if (!rep->init_section) {
xmlFree(initialization_val);
- xmlFree(range_val);
return AVERROR(ENOMEM);
}
rep->init_section->url = get_content_url(baseurl_nodes, 4,
@@ -626,24 +626,20 @@ static int parse_manifest_segmenturlnode(AVFormatContext *s, struct representati
rep_id_val,
rep_bandwidth_val,
initialization_val);
-
+ xmlFree(initialization_val);
if (!rep->init_section->url) {
av_freep(&rep->init_section);
- xmlFree(initialization_val);
- xmlFree(range_val);
return AVERROR(ENOMEM);
}
- xmlFree(initialization_val);
- xmlFree(range_val);
}
} else if (!av_strcasecmp(fragmenturl_node->name, (const char *)"SegmentURL")) {
media_val = xmlGetProp(fragmenturl_node, "media");
range_val = xmlGetProp(fragmenturl_node, "mediaRange");
if (media_val || range_val) {
struct fragment *seg = get_Fragment(range_val);
+ xmlFree(range_val);
if (!seg) {
xmlFree(media_val);
- xmlFree(range_val);
return AVERROR(ENOMEM);
}
seg->url = get_content_url(baseurl_nodes, 4,
@@ -651,15 +647,12 @@ static int parse_manifest_segmenturlnode(AVFormatContext *s, struct representati
rep_id_val,
rep_bandwidth_val,
media_val);
+ xmlFree(media_val);
if (!seg->url) {
av_free(seg);
- xmlFree(media_val);
- xmlFree(range_val);
return AVERROR(ENOMEM);
}
dynarray_add(&rep->fragments, &rep->n_fragments, seg);
- xmlFree(media_val);
- xmlFree(range_val);
}
}