[FFmpeg-cvslog] asfdec_o: reject size > INT64_MAX in asf_read_unknown
Andreas Cadhalpun
git at videolan.org
Fri Jan 15 01:00:55 CET 2016
ffmpeg | branch: master | Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> | Tue Jan 5 13:20:11 2016 +0100| [aa180169961b46cf0d2bcc23cb686f93c079b256] | committer: Andreas Cadhalpun
asfdec_o: 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.
Reviewed-by: Alexandra Hájková <alexandra.khirnova at gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aa180169961b46cf0d2bcc23cb686f93c079b256
---
libavformat/asfdec_o.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c
index 79b9ee4..02809bb 100644
--- a/libavformat/asfdec_o.c
+++ b/libavformat/asfdec_o.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