1. ffmpeg
  2. Commit 61620896a1acd80e00cb8821febe39efd3724978
Browse code

avcodec/qdm2: The smallest header seems to have 2 bytes so treat 1 as invalid

Fixes: Timeout (217sec -> 2ms)
Fixes: 18488/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_QDM2_fuzzer-5708293662310400

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit e36ccb5048f052b8b2ef08281cb607fa53a7b7e4)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Michael Niedermayer authored on 2019/10/31 23:22:53
Showing 1 changed files
libavcodec/qdm2.c
History View file @ 6162089
... ... 
@@ -1704,7 +1704,7 @@ static av_cold int qdm2_decode_init(AVCodecContext *avctx)
1704 1704 
     s->group_size = bytestream2_get_be32(&gb);
1705 1705 
     s->fft_size = bytestream2_get_be32(&gb);
1706 1706 
     s->checksum_size = bytestream2_get_be32(&gb);
1707 
-    if (s->checksum_size >= 1U << 28 || !s->checksum_size) {
1707 
+    if (s->checksum_size >= 1U << 28 || s->checksum_size <= 1) {
1708 1708 
         av_log(avctx, AV_LOG_ERROR, "data block size invalid (%u)\n", s->checksum_size);
1709 1709 
         return AVERROR_INVALIDDATA;
1710 1710 
     }