From f083f20fd215ef8c0b7fa9f4abf885df6d322b8a Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 8 Feb 2021 14:29:01 +0100 Subject: [PATCH] avformat/wtvdec: Check len in parse_chunks() to avoid overflow Fixes: signed integer overflow: 2147483647 + 7 cannot be represented in type 'int' Fixes: 30084/clusterfuzz-testcase-minimized-ffmpeg_dem_WTV_fuzzer-6192261941559296 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Peter Ross Signed-off-by: Michael Niedermayer (cherry picked from commit 5552ceaf568915e668679f9581e07eb5507cafc4) Signed-off-by: Michael Niedermayer --- libavformat/wtvdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c index ed3ebb3d89..6f4d266992 100644 --- a/libavformat/wtvdec.c +++ b/libavformat/wtvdec.c @@ -795,7 +795,7 @@ static int parse_chunks(AVFormatContext *s, int mode, int64_t seekts, int *len_p ff_get_guid(pb, &g); len = avio_rl32(pb); - if (len < 32) { + if (len < 32 || len > INT_MAX - 7) { int ret; if (avio_feof(pb)) return AVERROR_EOF;