RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/vf_edgedetect: fix heap-buffer overflow 

Fixes #8275

(cherry picked from commit de598f82f8)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Paul B Mahol 2019-10-15 16:38:40 +02:00 committed by Michael Niedermayer
parent e103a2cb9c
commit 156af49b09
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavfilter/vf_edgedetect.c
View File

@ -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;