Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/ffv1dec: Fix end handling
Date: Tue, 25 Mar 2025 15:06:52 +0100
Message-ID: <20250325140655.612516-2-michael@niedermayer.cc> (raw)
In-Reply-To: <20250325140655.612516-1-michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/ffv1dec.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
index 25b55864107..3395f514f42 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);
-- 
2.48.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

  reply	other threads:[~2025-03-25 14:07 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-25 14:06 [FFmpeg-devel] [PATCH 1/5] avcodec/ffv1enc: Eliminate encode_mul() Michael Niedermayer
2025-03-25 14:06 ` Michael Niedermayer [this message]
2025-03-25 14:06 ` [FFmpeg-devel] [PATCH 3/5] avcodec/ffv1enc: Fix end handling Michael Niedermayer
2025-03-25 14:06 ` [FFmpeg-devel] [PATCH 4/5] avcodec/ffv1enc: Fix off by 1 in assert Michael Niedermayer
2025-03-25 14:06 ` [FFmpeg-devel] [PATCH 5/5] avcodec/ffv1enc: Store run1start_mul_index instead of computing Michael Niedermayer
2025-03-26 13:10 ` [FFmpeg-devel] [PATCH 1/5] avcodec/ffv1enc: Eliminate encode_mul() Michael Niedermayer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250325140655.612516-2-michael@niedermayer.cc \
    --to=michael@niedermayer.cc \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git