File ffmpeg-CVE-2020-20892.patch of Package ffmpeg

Overview Repositories Revisions Requests Users Attributes Meta

File ffmpeg-CVE-2020-20892.patch of Package ffmpeg

From 19587c9332f5be4f6bc6d7b2b8ef3fd21dfeaa01 Mon Sep 17 00:00:00 2001
From: Paul B Mahol <onemda@gmail.com>
Date: Sun, 13 Oct 2019 23:28:16 +0200
Subject: [PATCH] avfilter/vf_lenscorrection: fix division by zero

Fixes #8265
---
 libavfilter/vf_lenscorrection.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libavfilter/vf_lenscorrection.c b/libavfilter/vf_lenscorrection.c
index b5400a2f37..ac3c490821 100644
--- a/libavfilter/vf_lenscorrection.c
+++ b/libavfilter/vf_lenscorrection.c
@@ -155,10 +155,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
     for (plane = 0; plane < rect->nb_planes; ++plane) {
         int hsub = plane == 1 || plane == 2 ? rect->hsub : 0;
         int vsub = plane == 1 || plane == 2 ? rect->vsub : 0;
-        int hdiv = 1 << hsub;
-        int vdiv = 1 << vsub;
-        int w = rect->width / hdiv;
-        int h = rect->height / vdiv;
+        int w = AV_CEIL_RSHIFT(rect->width, hsub);
+        int h = AV_CEIL_RSHIFT(rect->height, vsub);
         int xcenter = rect->cx * w;
         int ycenter = rect->cy * h;
         int k1 = rect->k1 * (1<<24);
-- 
2.33.0

Places

File ffmpeg-CVE-2020-20892.patch of Package ffmpeg

Places