[FFmpeg-cvslog] asfdec: reject size > INT64_MAX in asf_read_unknown

Andreas Cadhalpun git at videolan.org
Tue Jan 19 08:45:57 CET 2016


ffmpeg | branch: master | Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> | Wed Jan  6 07:32:25 2016 +0100| [2aec600ae7af7d46a4877b5ccc263b39f05a91cb] | committer: Anton Khirnov

asfdec: reject size > INT64_MAX in asf_read_unknown

Both avio_skip and detect_unknown_subobject use int64_t for the size
parameter.

This fixes a segmentation fault due to infinite recursion.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Signed-off-by: Alexandra Hájková <alexandra.khirnova at gmail.com>
Signed-off-by: Anton Khirnov <anton at khirnov.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2aec600ae7af7d46a4877b5ccc263b39f05a91cb
---

 libavformat/asfdec.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index 58480dc..4fc0e3d 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -178,6 +178,9 @@ static int asf_read_unknown(AVFormatContext *s, const GUIDParseTable *g)
     uint64_t size   = avio_rl64(pb);
     int ret;
 
+    if (size > INT64_MAX)
+        return AVERROR_INVALIDDATA;
+
     if (asf->is_header)
         asf->unknown_size = size;
     asf->is_header = 0;



More information about the ffmpeg-cvslog mailing list