diff options
| author | Paul B Mahol <onemda@gmail.com> | 2019-10-15 16:38:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2022-05-04 20:00:05 +0200 |
| commit | 156af49b09af3828cd4fed4ab6ca58f1b78949da (patch) | |
| tree | c5bdf6515a135c552c77aab12a927e6b7e4982d3 | |
| parent | e103a2cb9cd970f2c24525336057bccb2f3fcca3 (diff) | |
| download | ffmpeg-156af49b09af3828cd4fed4ab6ca58f1b78949da.tar.gz | |
avfilter/vf_edgedetect: fix heap-buffer overflow
Fixes #8275
(cherry picked from commit de598f82f8c3f8000e1948548e8088148e2b1f44)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavfilter/vf_edgedetect.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavfilter/vf_edgedetect.c b/libavfilter/vf_edgedetect.c index 11a31fa4ff..25ae6dfacc 100644 --- a/libavfilter/vf_edgedetect.c +++ b/libavfilter/vf_edgedetect.c @@ -154,7 +154,8 @@ static void gaussian_blur(AVFilterContext *ctx, int w, int h, 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]; + if (w > 1) + dst[1] = src[1]; for (i = 2; i < w - 2; i++) { /* Gaussian mask of size 5x5 with sigma = 1.4 */ dst[i] = ((src[-2*src_linesize + i-2] + src[2*src_linesize + i-2]) * 2 @@ -175,8 +176,10 @@ static void gaussian_blur(AVFilterContext *ctx, int w, int h, + src[i+1] * 12 + src[i+2] * 5) / 159; } - dst[i ] = src[i ]; - dst[i + 1] = src[i + 1]; + if (w > 2) + dst[i ] = src[i ]; + if (w > 3) + dst[i + 1] = src[i + 1]; dst += dst_linesize; src += src_linesize; |