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 e134c20374ee3cbc6d04885d306b02c9871683a2.
Unified · Split
| @@ -122,19 +122,6 @@ struct representation { · 121 unmodified lines | |||
| 122 | typedef struct DASHContext { | 122 | typedef struct DASHContext { |
| 123 | const AVClass *class; | 123 | const AVClass *class; |
| 124 | char *base_url; | 124 | char *base_url; |
| 125 | char *adaptionset_contenttype_val; | ||
| 126 | char *adaptionset_par_val; | ||
| 127 | char *adaptionset_lang_val; | ||
| 128 | char *adaptionset_minbw_val; | ||
| 129 | char *adaptionset_maxbw_val; | ||
| 130 | char *adaptionset_minwidth_val; | ||
| 131 | char *adaptionset_maxwidth_val; | ||
| 132 | char *adaptionset_minheight_val; | ||
| 133 | char *adaptionset_maxheight_val; | ||
| 134 | char *adaptionset_minframerate_val; | ||
| 135 | char *adaptionset_maxframerate_val; | ||
| 136 | char *adaptionset_segmentalignment_val; | ||
| 137 | char *adaptionset_bitstreamswitching_val; | ||
| 138 | 125 | ||
| 139 | int n_videos; | 126 | int n_videos; |
| 140 | struct representation **videos; | 127 | struct representation **videos; |
| @@ -1124,26 +1111,12 @@ static int parse_manifest_adaptationset(AVFormatContext *s, const char *url, · 983 unmodified lines | |||
| 1124 | xmlNodePtr period_segmentlist_node) | 1111 | xmlNodePtr period_segmentlist_node) |
| 1125 | { | 1112 | { |
| 1126 | int ret = 0; | 1113 | int ret = 0; |
| 1127 | DASHContext *c = s->priv_data; | ||
| 1128 | xmlNodePtr fragment_template_node = NULL; | 1114 | xmlNodePtr fragment_template_node = NULL; |
| 1129 | xmlNodePtr content_component_node = NULL; | 1115 | xmlNodePtr content_component_node = NULL; |
| 1130 | xmlNodePtr adaptionset_baseurl_node = NULL; | 1116 | xmlNodePtr adaptionset_baseurl_node = NULL; |
| 1131 | xmlNodePtr adaptionset_segmentlist_node = NULL; | 1117 | xmlNodePtr adaptionset_segmentlist_node = NULL; |
| 1132 | xmlNodePtr adaptionset_supplementalproperty_node = NULL; | 1118 | xmlNodePtr adaptionset_supplementalproperty_node = NULL; |
| 1133 | xmlNodePtr node = NULL; | 1119 | xmlNodePtr node = NULL; |
| 1134 | c->adaptionset_contenttype_val = xmlGetProp(adaptionset_node, "contentType"); | ||
| 1135 | c->adaptionset_par_val = xmlGetProp(adaptionset_node, "par"); | ||
| 1136 | c->adaptionset_lang_val = xmlGetProp(adaptionset_node, "lang"); | ||
| 1137 | c->adaptionset_minbw_val = xmlGetProp(adaptionset_node, "minBandwidth"); | ||
| 1138 | c->adaptionset_maxbw_val = xmlGetProp(adaptionset_node, "maxBandwidth"); | ||
| 1139 | c->adaptionset_minwidth_val = xmlGetProp(adaptionset_node, "minWidth"); | ||
| 1140 | c->adaptionset_maxwidth_val = xmlGetProp(adaptionset_node, "maxWidth"); | ||
| 1141 | c->adaptionset_minheight_val = xmlGetProp(adaptionset_node, "minHeight"); | ||
| 1142 | c->adaptionset_maxheight_val = xmlGetProp(adaptionset_node, "maxHeight"); | ||
| 1143 | c->adaptionset_minframerate_val = xmlGetProp(adaptionset_node, "minFrameRate"); | ||
| 1144 | c->adaptionset_maxframerate_val = xmlGetProp(adaptionset_node, "maxFrameRate"); | ||
| 1145 | c->adaptionset_segmentalignment_val = xmlGetProp(adaptionset_node, "segmentAlignment"); | ||
| 1146 | c->adaptionset_bitstreamswitching_val = xmlGetProp(adaptionset_node, "bitstreamSwitching"); | ||
| 1147 | 1120 | ||
| 1148 | node = xmlFirstElementChild(adaptionset_node); | 1121 | node = xmlFirstElementChild(adaptionset_node); |
| 1149 | while (node) { | 1122 | while (node) { |