Commit 317cfaa5 authored by Alexandra Hájková's avatar Alexandra Hájková Committed by Luca Barbato

asfdec: prevent the memory leak in the asf_read_metada_obj

also do not return the error code but just break reading
metadata object in the case of the aspect ratio reading failure
Signed-off-by: 's avatarLuca Barbato <lu_zero@gentoo.org>
parent 58c3720a
...@@ -590,8 +590,10 @@ static int asf_read_metadata_obj(AVFormatContext *s, const GUIDParseTable *g) ...@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment