diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2019-06-24 01:01:04 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-07-08 09:44:36 +0200 |
commit | 7b2ebf89a411d957ca999f1e7a919ff617fbfd56 (patch) | |
tree | 43cd89818a74a00fdeb8bfbc18466ac9d6e610fd /libavcodec | |
parent | 694be24bd6c4cc9c62222f4583260bf79056e4c1 (diff) | |
download | ffmpeg-7b2ebf89a411d957ca999f1e7a919ff617fbfd56.tar.gz |
avcodec/qdm2: Check checksum_size for 0
Fixes: Infinite loop
Fixes: 15337/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_QDM2_fuzzer-5757428949319680
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/qdm2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c index 1e91f477e8..eaffb36dcc 100644 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@ -1704,8 +1704,8 @@ static av_cold int qdm2_decode_init(AVCodecContext *avctx) s->group_size = bytestream2_get_be32(&gb); s->fft_size = bytestream2_get_be32(&gb); s->checksum_size = bytestream2_get_be32(&gb); - if (s->checksum_size >= 1U << 28) { - av_log(avctx, AV_LOG_ERROR, "data block size too large (%u)\n", s->checksum_size); + if (s->checksum_size >= 1U << 28 || !s->checksum_size) { + av_log(avctx, AV_LOG_ERROR, "data block size invalid (%u)\n", s->checksum_size); return AVERROR_INVALIDDATA; } |