]> git.sesse.net Git - ffmpeg/commitdiff
avformat/genh: Check block_align for how it will be used in SDX2_DPCM
authorMichael Niedermayer <michael@niedermayer.cc>
Sat, 17 Oct 2020 21:40:57 +0000 (23:40 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 23 Oct 2020 08:07:57 +0000 (10:07 +0200)
Fixes: signed integer overflow: 19922944 * 1024 cannot be represented in type 'int'
Fixes: 26402/clusterfuzz-testcase-minimized-ffmpeg_dem_VMD_fuzzer-5745470053548032
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/genh.c

index 61adf499647106752f20746eaf66cce2f035e660..ed9910503d81d261860ba5ea8d61889180f6b7ff 100644 (file)
@@ -87,7 +87,9 @@ static int genh_read_header(AVFormatContext *s)
     case  5: st->codecpar->codec_id = st->codecpar->block_align > 0 ?
                                    AV_CODEC_ID_PCM_S8_PLANAR :
                                    AV_CODEC_ID_PCM_S8;           break;
-    case  6: st->codecpar->codec_id = AV_CODEC_ID_SDX2_DPCM;        break;
+    case  6: if (st->codecpar->block_align > INT_MAX/1024)
+                 return AVERROR_INVALIDDATA;
+             st->codecpar->codec_id = AV_CODEC_ID_SDX2_DPCM;        break;
     case  7: ret = ff_alloc_extradata(st->codecpar, 2);
              if (ret < 0)
                  return ret;