From 9230c93cc9fdbee1df389b3f2e04893db195f830 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 8 May 2025 23:42:13 +0200 Subject: [PATCH] avcodec/rv60dec: inter also fails with qp >= 32 Fixes: out of array read in decode_cu_16x16() Fixes: 398049430/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RV60_fuzzer-5525836849807360 Reviewed-by: Peter Ross Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/rv60dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/rv60dec.c b/libavcodec/rv60dec.c index 24981015a9..d704ae512c 100644 --- a/libavcodec/rv60dec.c +++ b/libavcodec/rv60dec.c @@ -1791,7 +1791,7 @@ static int decode_cu_r(RV60Context * s, AVFrame * frame, ThreadContext * thread, ttype = cu.pu_type == PU_FULL ? TRANSFORM_8X8 : TRANSFORM_4X4; is_intra = cu.cu_type == CU_INTRA; - if (is_intra && qp >= 32) + if (qp >= 32) return AVERROR_INVALIDDATA; cu_pos = ((xpos & 63) >> 3) + ((ypos & 63) >> 3) * 8;