File ffmpeg-CVE-2020-22032.patch of Package ffmpeg.21074

Overview Repositories Revisions Requests Users Attributes Meta

File ffmpeg-CVE-2020-22032.patch of Package ffmpeg.21074

diff --unified --recursive --text --new-file --color ffmpeg-3.4.2.old/libavfilter/vf_edgedetect.c ffmpeg-3.4.2.new/libavfilter/vf_edgedetect.c
--- ffmpeg-3.4.2.old/libavfilter/vf_edgedetect.c	2021-06-10 15:41:34.152444328 +0800
+++ ffmpeg-3.4.2.new/libavfilter/vf_edgedetect.c	2021-06-10 15:41:51.715762956 +0800
@@ -126,7 +126,8 @@
         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
@@ -147,8 +148,10 @@
                     + 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;

Places

File ffmpeg-CVE-2020-22032.patch of Package ffmpeg.21074

Places