File ffmpeg-CVE-2020-22025.patch of Package ffmpeg.32491
From ccf4ab8c9aca0aee66bcc2914031a9c97ac0eeb8 Mon Sep 17 00:00:00 2001
From: Paul B Mahol <onemda@gmail.com>
Date: Sun, 13 Oct 2019 17:23:10 +0200
Subject: [PATCH] avfilter/vf_edgedetect: check if height is big enough
Fixes #8260
---
libavfilter/vf_edgedetect.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/libavfilter/vf_edgedetect.c b/libavfilter/vf_edgedetect.c
index a0ddcbbf5c..11a31fa4ff 100644
--- a/libavfilter/vf_edgedetect.c
+++ b/libavfilter/vf_edgedetect.c
@@ -150,7 +150,8 @@ static void gaussian_blur(AVFilterContext *ctx, int w, int h,
int i, j;
memcpy(dst, src, w); dst += dst_linesize; src += src_linesize;
- memcpy(dst, src, w); dst += dst_linesize; src += src_linesize;
+ if (h > 1)
+ memcpy(dst, src, w); dst += dst_linesize; src += src_linesize;
for (j = 2; j < h - 2; j++) {
dst[0] = src[0];
dst[1] = src[1];
@@ -180,8 +181,10 @@ static void gaussian_blur(AVFilterContext *ctx, int w, int h,
dst += dst_linesize;
src += src_linesize;
}
- memcpy(dst, src, w); dst += dst_linesize; src += src_linesize;
- memcpy(dst, src, w);
+ if (h > 2)
+ memcpy(dst, src, w); dst += dst_linesize; src += src_linesize;
+ if (h > 3)
+ memcpy(dst, src, w);
}
enum {
--
2.31.1