diff options
| author | Andreas Rheinhardt <[email protected]> | 2020-09-07 19:25:22 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <[email protected]> | 2021-02-27 07:20:59 +0100 |
| commit | c182a2ba403f979fd7c33cc1b097fcc5c9f45e01 (patch) | |
| tree | 10d65d602d2cdf38143bc56de0234c72716f4f61 | |
| parent | 9b9fd0dd20cb7385b56d5d7d6cde9d44017bb380 (diff) | |
avformat/dashdec: Free strings as soon as they aren't needed anymore
Reviewed-by: Steven Liu <[email protected]>
Signed-off-by: Andreas Rheinhardt <[email protected]>
(cherry picked from commit 7369e952676595b1ccf1e707e741f6c1f05481aa)
| -rw-r--r-- | libavformat/dashdec.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index dda95668bb..ee24dc6467 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); } } |