avformat/asfdec_o: Check size_bmp more fully
authorMichael Niedermayer <michael@niedermayer.cc>
Tue, 3 Jul 2018 19:01:23 +0000 (21:01 +0200)
committerJames Almer <jamrial@gmail.com>
Wed, 8 Aug 2018 04:37:20 +0000 (01:37 -0300)
Fixes: integer overflow and out of array access
Fixes: asfo-crash-46080c4341572a7137a162331af77f6ded45cbd7

Found-by: Paul Ch <paulcher@icloud.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 2b46ebdbff1d8dec7a3d8ea280a612b91a582869)
Signed-off-by: James Almer <jamrial@gmail.com>
libavformat/asfdec_o.c

index 593c010..3f43fd1 100644 (file)
@@ -704,7 +704,8 @@ static int parse_video_info(AVIOContext *pb, AVStream *st)
     st->codecpar->codec_id  = ff_codec_get_id(ff_codec_bmp_tags, tag);
     size_bmp = FFMAX(size_asf, size_bmp);
 
-    if (size_bmp > BMP_HEADER_SIZE) {
+    if (size_bmp > BMP_HEADER_SIZE &&
+        size_bmp < INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE) {
         int ret;
         st->codecpar->extradata_size  = size_bmp - BMP_HEADER_SIZE;
         if (!(st->codecpar->extradata = av_malloc(st->codecpar->extradata_size +