Merge commit '317cfaa5e09755ed0b34af512ec687963a67bdbf'

* commit '317cfaa5e09755ed0b34af512ec687963a67bdbf':
  asfdec: prevent the memory leak in the asf_read_metada_obj

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
pull/146/head
Hendrik Leppkes 9 years ago
commit 649b2e4c83
  1. 6
      libavformat/asfdec_o.c

@ -590,8 +590,10 @@ static int asf_read_metadata_obj(AVFormatContext *s, const GUIDParseTable *g)
buflen); buflen);
if (!strcmp(name, "AspectRatioX") || !strcmp(name, "AspectRatioY")) { if (!strcmp(name, "AspectRatioX") || !strcmp(name, "AspectRatioY")) {
ret = asf_store_aspect_ratio(s, st_num, name, type); ret = asf_store_aspect_ratio(s, st_num, name, type);
if (ret < 0) if (ret < 0) {
return ret; av_freep(&name);
break;
}
} else { } else {
if (st_num < ASF_MAX_STREAMS) { if (st_num < ASF_MAX_STREAMS) {
if ((ret = process_metadata(s, name, name_len, val_len, type, if ((ret = process_metadata(s, name, name_len, val_len, type,

Loading…
Cancel
Save