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

avformat/dashdec: Don't allocate and leak strings that are never used 

Since commit e134c203 strdups of several elements of a manifest are kept
in the DASHContext; but said commit completely forgot to free these
strings again (with xmlFree()). Given that these strings are never used
at all, this commit closes this leak by reverting said commit.

This reverts commit e134c20374.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
(cherry picked from commit 3c138e5ceb)
This commit is contained in:
Andreas Rheinhardt 2020-03-29 01:32:34 +01:00
parent 4521700f29
commit de3d708dbf
1 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libavformat/dashdec.c
View File

@ -122,19 +122,6 @@ struct representation {
typedef struct DASHContext {
const AVClass *class;
char *base_url;
char *adaptionset_contenttype_val;
char *adaptionset_par_val;
char *adaptionset_lang_val;
char *adaptionset_minbw_val;
char *adaptionset_maxbw_val;
char *adaptionset_minwidth_val;
char *adaptionset_maxwidth_val;
char *adaptionset_minheight_val;
char *adaptionset_maxheight_val;
char *adaptionset_minframerate_val;
char *adaptionset_maxframerate_val;
char *adaptionset_segmentalignment_val;
char *adaptionset_bitstreamswitching_val;
int n_videos;
struct representation **videos;
@ -1080,26 +1067,12 @@ static int parse_manifest_adaptationset(AVFormatContext *s, const char *url,
xmlNodePtr period_segmentlist_node)
{
int ret = 0;
DASHContext *c = s->priv_data;
xmlNodePtr fragment_template_node = NULL;
xmlNodePtr content_component_node = NULL;
xmlNodePtr adaptionset_baseurl_node = NULL;
xmlNodePtr adaptionset_segmentlist_node = NULL;
xmlNodePtr adaptionset_supplementalproperty_node = NULL;
xmlNodePtr node = NULL;
c->adaptionset_contenttype_val = xmlGetProp(adaptionset_node, "contentType");
c->adaptionset_par_val = xmlGetProp(adaptionset_node, "par");
c->adaptionset_lang_val = xmlGetProp(adaptionset_node, "lang");
c->adaptionset_minbw_val = xmlGetProp(adaptionset_node, "minBandwidth");
c->adaptionset_maxbw_val = xmlGetProp(adaptionset_node, "maxBandwidth");
c->adaptionset_minwidth_val = xmlGetProp(adaptionset_node, "minWidth");
c->adaptionset_maxwidth_val = xmlGetProp(adaptionset_node, "maxWidth");
c->adaptionset_minheight_val = xmlGetProp(adaptionset_node, "minHeight");
c->adaptionset_maxheight_val = xmlGetProp(adaptionset_node, "maxHeight");
c->adaptionset_minframerate_val = xmlGetProp(adaptionset_node, "minFrameRate");
c->adaptionset_maxframerate_val = xmlGetProp(adaptionset_node, "maxFrameRate");
c->adaptionset_segmentalignment_val = xmlGetProp(adaptionset_node, "segmentAlignment");
c->adaptionset_bitstreamswitching_val = xmlGetProp(adaptionset_node, "bitstreamSwitching");
node = xmlFirstElementChild(adaptionset_node);
while (node) {