RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Andreas Rheinhardt 2020-09-07 19:25:22 +02:00
parent 17963a6ad7
commit 7369e95267
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavformat/dashdec.c
View File

@ -616,9 +616,9 @@ static int parse_manifest_segmenturlnode(AVFormatContext *s, struct representati
if (initialization_val || range_val) { if (initialization_val || range_val) {
free_fragment(&rep->init_section); free_fragment(&rep->init_section);
rep->init_section = get_Fragment(range_val); rep->init_section = get_Fragment(range_val);
xmlFree(range_val);
if (!rep->init_section) { if (!rep->init_section) {
xmlFree(initialization_val); xmlFree(initialization_val);
xmlFree(range_val);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
rep->init_section->url = get_content_url(baseurl_nodes, 4, 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_id_val,
rep_bandwidth_val, rep_bandwidth_val,
initialization_val); initialization_val);
xmlFree(initialization_val);
if (!rep->init_section->url) { if (!rep->init_section->url) {
av_freep(&rep->init_section); av_freep(&rep->init_section);
xmlFree(initialization_val);
xmlFree(range_val);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
xmlFree(initialization_val);
xmlFree(range_val);
} }
} else if (!av_strcasecmp(fragmenturl_node->name, (const char *)"SegmentURL")) { } else if (!av_strcasecmp(fragmenturl_node->name, (const char *)"SegmentURL")) {
media_val = xmlGetProp(fragmenturl_node, "media"); media_val = xmlGetProp(fragmenturl_node, "media");
range_val = xmlGetProp(fragmenturl_node, "mediaRange"); range_val = xmlGetProp(fragmenturl_node, "mediaRange");
if (media_val || range_val) { if (media_val || range_val) {
struct fragment *seg = get_Fragment(range_val); struct fragment *seg = get_Fragment(range_val);
xmlFree(range_val);
if (!seg) { if (!seg) {
xmlFree(media_val); xmlFree(media_val);
xmlFree(range_val);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
seg->url = get_content_url(baseurl_nodes, 4, 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_id_val,
rep_bandwidth_val, rep_bandwidth_val,
media_val); media_val);
xmlFree(media_val);
if (!seg->url) { if (!seg->url) {
av_free(seg); av_free(seg);
xmlFree(media_val);
xmlFree(range_val);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
dynarray_add(&rep->fragments, &rep->n_fragments, seg); dynarray_add(&rep->fragments, &rep->n_fragments, seg);
xmlFree(media_val);
xmlFree(range_val);
} }
} }