[FFmpeg-devel] [PATCH 6/7] avcodec/rv60dec: inter also fails with qp >= 32

[Michael Niedermayer]

Fixes: out of array read in decode_cu_16x16()
Fixes: 398049430/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RV60_fuzzer-5525836849807360

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
 libavcodec/rv60dec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/rv60dec.c b/libavcodec/rv60dec.c
index 24981015a94..d704ae512c2 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;
 
-- 
2.49.0