[FFmpeg-cvslog] avcodec/ffv1dec: Fix end handling
Michael Niedermayer
git at videolan.org
Fri Mar 28 01:30:11 EET 2025
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Tue Mar 25 12:30:16 2025 +0100| [430065a97b08f7065629b743b26622980cd6e212] | committer: Michael Niedermayer
avcodec/ffv1dec: Fix end handling
Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=430065a97b08f7065629b743b26622980cd6e212
---
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);
More information about the ffmpeg-cvslog
mailing list