From 430065a97b08f7065629b743b26622980cd6e212 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 25 Mar 2025 12:30:16 +0100 Subject: [PATCH] avcodec/ffv1dec: Fix end handling Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/ffv1dec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 25b5586410..3395f514f4 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -324,9 +324,9 @@ static int decode_remap(FFV1Context *f, FFV1SliceContext *sc) return AVERROR_INVALIDDATA; //not sure we should check this i += current_mul - 1 + delta; } - if (i == end) + if (i - 1 >= end) break; - if (i - 1 > end || j >= FF_ARRAY_ELEMS(sc->fltmap[p])) + if (j >= FF_ARRAY_ELEMS(sc->fltmap[p])) return AVERROR_INVALIDDATA; if (end <= 0xFFFF) { sc->fltmap [p][j++] = i ^ ((i& 0x8000) ? 0 : flip);