From f09c834a7d01dfde9369551b2767c001846a396f Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 21 Jun 2025 23:15:21 +0200 Subject: [PATCH] avcodec/cbs_apv_syntax_template: Check tile_data_size Fixes: heap-buffer-overflow Fixes: 418421333/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APV_fuzzer-6592025183191040 Fixes: 418804929/clusterfuzz-testcase-minimized-ffmpeg_BSF_APV_METADATA_fuzzer-5773904646045696 Fixes: 420737045/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APV_fuzzer-5535272169439232 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/cbs_apv_syntax_template.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/cbs_apv_syntax_template.c b/libavcodec/cbs_apv_syntax_template.c index fc8a08ff31..b84565b107 100644 --- a/libavcodec/cbs_apv_syntax_template.c +++ b/libavcodec/cbs_apv_syntax_template.c @@ -236,6 +236,8 @@ static int FUNC(tile)(CodedBitstreamContext *ctx, RWContext *rw, #ifdef READ int pos = get_bits_count(rw); av_assert0(pos % 8 == 0); + if (get_bits_left(rw) < 8LL * comp_size) + return AVERROR_INVALIDDATA; current->tile_data[c] = (uint8_t*)align_get_bits(rw); skip_bits_long(rw, 8 * comp_size); #else