[FFmpeg-cvslog] asfdec: prevent the memory leak in the asf_read_metada_obj
Alexandra Hájková
git at videolan.org
Tue Aug 18 09:36:07 CEST 2015
ffmpeg | branch: master | Alexandra Hájková <alexandra.khirnova at gmail.com> | Thu Aug 13 10:16:20 2015 +0200| [317cfaa5e09755ed0b34af512ec687963a67bdbf] | committer: 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: Luca Barbato <lu_zero at gentoo.org>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=317cfaa5e09755ed0b34af512ec687963a67bdbf
---
libavformat/asfdec.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index 93e8c3c..4b04227 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -590,8 +590,10 @@ static int asf_read_metadata_obj(AVFormatContext *s, const GUIDParseTable *g)
buflen);
if (!strcmp(name, "AspectRatioX") || !strcmp(name, "AspectRatioY")) {
ret = asf_store_aspect_ratio(s, st_num, name, type);
- if (ret < 0)
- return ret;
+ if (ret < 0) {
+ av_freep(&name);
+ break;
+ }
} else {
if (st_num < ASF_MAX_STREAMS) {
if ((ret = process_metadata(s, name, name_len, val_len, type,
More information about the ffmpeg-cvslog
mailing list