From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: [FFmpeg-devel] [PATCH 2/4] avfilter/vf_swaprect: assert that rectangles are within memory
Date: Fri, 22 Dec 2023 22:45:00 +0100
Message-ID: <20231222214502.24596-2-michael@niedermayer.cc> (raw)
In-Reply-To: <20231222214502.24596-1-michael@niedermayer.cc>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
libavfilter/vf_swaprect.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavfilter/vf_swaprect.c b/libavfilter/vf_swaprect.c
index 13ae149afdb..8a983b605bf 100644
--- a/libavfilter/vf_swaprect.c
+++ b/libavfilter/vf_swaprect.c
@@ -18,6 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/avassert.h"
#include "libavutil/avstring.h"
#include "libavutil/eval.h"
#include "libavutil/imgutils.h"
@@ -182,6 +183,10 @@ FF_ENABLE_DEPRECATION_WARNINGS
y2[1] = y2[2] = AV_CEIL_RSHIFT(y2[0], s->desc->log2_chroma_h);
y2[0] = y2[3] = y2[0];
+
+ av_assert0(FFMAX(x1[1], x2[1]) + pw[1] <= lw[1]);
+ av_assert0(FFMAX(y1[1], y2[1]) + ph[1] <= lh[1]);
+
for (p = 0; p < s->nb_planes; p++) {
if (ph[p] == ah[p] && pw[p] == aw[p]) {
uint8_t *src = in->data[p] + y1[p] * in->linesize[p] + x1[p] * s->pixsteps[p];
--
2.17.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".
next prev parent reply other threads:[~2023-12-22 21:45 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-22 21:44 [FFmpeg-devel] [PATCH 1/4] avfilter/af_alimiter: Check nextpos before use Michael Niedermayer
2023-12-22 21:45 ` Michael Niedermayer [this message]
2023-12-22 21:45 ` [FFmpeg-devel] [PATCH 3/4] avfilter/vf_swaprect: Use height for vertical variables Michael Niedermayer
2023-12-22 21:45 ` [FFmpeg-devel] [PATCH 4/4] avfilter/vf_swaprect: round coordinates down Michael Niedermayer
2023-12-29 20:34 ` [FFmpeg-devel] [PATCH 1/4] avfilter/af_alimiter: Check nextpos before use 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=20231222214502.24596-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