[FFmpeg-cvslog] avfilter/vf_swaprect: assert that rectangles are within memory
Michael Niedermayer
git at videolan.org
Sun Apr 14 20:33:53 EEST 2024
ffmpeg | branch: release/5.1 | Michael Niedermayer <michael at niedermayer.cc> | Fri Dec 22 22:25:25 2023 +0100| [6fe4f88a77e51f384521ddfa5db0090e677f74e2] | committer: Michael Niedermayer
avfilter/vf_swaprect: assert that rectangles are within memory
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 9d1ba698d2bed1d4bed731b3be62e84d72c35476)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6fe4f88a77e51f384521ddfa5db0090e677f74e2
---
libavfilter/vf_swaprect.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavfilter/vf_swaprect.c b/libavfilter/vf_swaprect.c
index b76e3bb99d..283133e0a4 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"
@@ -170,6 +171,10 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
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];
More information about the ffmpeg-cvslog
mailing list