From patchwork Sun Oct 3 09:48:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30886 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp3289886iob; Sun, 3 Oct 2021 02:48:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy3Ij3I7Iu3RCHl76h2z7S2AIsucxrdneyfaakkE+EQuT7444RmwHMJL0St27Amxb+9SMaG X-Received: by 2002:a17:906:1e16:: with SMTP id g22mr9408526ejj.471.1633254525941; Sun, 03 Oct 2021 02:48:45 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p4si18628767edj.100.2021.10.03.02.48.45; Sun, 03 Oct 2021 02:48:45 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=NF3iTEHR; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3F90B68A43D; Sun, 3 Oct 2021 12:48:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073037.outbound.protection.outlook.com [40.92.73.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 840DE68A71A for ; Sun, 3 Oct 2021 12:48:32 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qsljnj3D7ZV192o0SIlRIg60Ey9DTwO8WESm5fz59xeVljbGoVg9rc+xAqyUQPNYYBe0yoH743odicVlJDiF4qGAkk75uNhVw/zdNZ7RBcVx+3pDelizRoz0jfKhE4UzIpcuUcSRuB76HPy/xysmJodosEPd+c15WqnK1MQHt21W//OCA1U/EqL65zKZVdace3VZ95DriEhSioB+P9v+GPTQanVcr5Di8qlBMIlVUBNFrsxI1kCtQENHLPI4dUa6J/CaRgn4jmJv4S9H/Ki7Ifb8C/qslQnZ1nMfmETrbvjkAnavM9UAPMEjHW5T3tWRMJcu1Z3FlWR0Qh2UIvj5iQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=keK1urwdwzfXRDu4o/yABOaMG1OVqCYB/BuI4fBAQzE=; b=Tvq0JXVMykLWeskj3zq0KMz4L+HpfsDACbDxC4iBHgRcV8ouHtLkWLAYqYN7L+8A/EcnXKosqABSsTxzCsD+/b2cYN4ctW/fcvM8cnklkCoebaqk3H7Wfvh9s3m+HKAJSTZ785OzdLJq1zobxtI9uv521q0EbkKLDMM/M2IYL1ML07A27iAe7zfeaCB4N2oQ6qXx8zijGQ4HNlYF4jyTQk8Nx0j47bfZXF7IALCHN2SG0qe2pGZRnXOihCPApAjbe4sZIz4snfueM5VKarVvE2sa7srndPvj8MFi3T+czGNAaFkNLIxFE7D5Ilt0SeJeiJQgTjt0CDlIbwU01MFwrA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=keK1urwdwzfXRDu4o/yABOaMG1OVqCYB/BuI4fBAQzE=; b=NF3iTEHR445DwNghGft3+3kOrpVg4Rb1QbaMSPcTwhyVGjTkCGtNE7DQEdoW+lAUehYTKCLyf9ekemc3S2iMdfWqDBkLm7zDssbXq4D6AWnK0ukWfL1/eaWCZOQpSrA64hwLmIxRt6qny1MXvj0oKQCnqf0bmde020QkT4zlyPbvZhI8ofg/bcvDSIC4gfVBiygzGC/d3fr+QJX790YZQw0DNPnMl0AorYYxM5vukROT+2B/OK5d+gPJoU1kCBlaZ44mQ5S64phed8990fqnYrpym7HEwky0Mm3xd6SXH9x6vASMUEjLBTyUgx4nyXVHbw1UytUgMkhwanEocGRn7g== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6328.eurprd03.prod.outlook.com (2603:10a6:20b:141::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.16; Sun, 3 Oct 2021 09:48:26 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.019; Sun, 3 Oct 2021 09:48:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Oct 2021 11:48:16 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [oCHiOXr9UyQwY5UPe/Jey1yJpAnYUaKU] X-ClientProxiedBy: AM3PR05CA0114.eurprd05.prod.outlook.com (2603:10a6:207:2::16) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211003094818.3416770-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM3PR05CA0114.eurprd05.prod.outlook.com (2603:10a6:207:2::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Sun, 3 Oct 2021 09:48:26 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1ba1cefc-2028-4387-5471-08d98652f287 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQbzu686YDUKEY6maueAvXAEPnU6EzZs6XooopJsExwQrBAotop5JzWiuTZWm+n70biKrwHor+2F7F2aj3qFKYIvzOj1ZNskOaABq87ScVcdOJlF3gzzzaesV5dFSCGsjgpZo8nMIbuLLjYSqwuNGxvJFiJk9KMPhKYf6t9jG0kYCRLzWxR0We9+W7wM2wbXsGHz/i+YYlYWzX6SZqenqx22cTz1AWvTDXDlaJUcgB8jJB50+CYVJiR7TX9fFJXeQyxHr440xpgmSv94kw0ec5wA2L/gpGZhXXm7Foyar/vfhoUglLl4NxjAgsg3HVJWT7bV+Jocm1+uGNbvKvyBzv3I1rpdjyKrIEC9wD6GsL4IcnoNc9Dgk5/ggsWq7a1NLNEZN3siY5m8+hJYc2lU4zwmeFMCvEK1eU7SjZXRKuO2mwyc++TFwZ215bRJyhNOw+OxL5TBiKoH7Mg6ZSbJPIAR8w1gqXkqMQPy7iWUzxHpxeGE5uj0XeUKjfS4hz0CQe5aASloZdXFNTcNeDBbKGgOhSiRHdnXvDfCgrbQYcekBZE0kjmP7ah1t/5yLMufK5CiHLi/D2Z59lmL2XYHU/kodo/L26+6A+vmR3fzhT9IYSqwd4R+jLCGmIPnPtCoBAEByw1lSe0p9guQXvPMJauZzm1c5h6VE9uXSxVbOeqMeCnz7BVCJDN1EQVDsatZ2x6Cmd0Zle6qiN9884YdovVZSKt9Q/rRlqt0uXugmasTuYF5qrNr4dqlNqaAGMn55E= X-MS-TrafficTypeDiagnostic: AM7PR03MB6328: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2mPdS+K31WMH922FWzAlSb45jIzHazIMtlZlBc2B3slWf9QOtRcxE5FHo4SwuJLY9SEMB0YmutsOdh3UIe3FZfBJmLENEEa2ouPmVOeY9w6p3Lw5uJAFAw6Tt9TcxBE79LiMR/qkg/5m2YO4dLbDXwI6FSyxA/VR8FfU9R+JAzMW3hjXmon80tG3SiWhn64bwRYqutOhjiS0tHjXldE2iS0Dlh2VEDEP45sY3MjKRmzdONDftZJ3bw0vKp2utsAKek/M9s8EtQedYYpGlDP14W0qYaKO36i6kqh+454xahyFTHCvhEyerES/qthK3uCYibiPzLcEuEPupcSl6QNNqf/xMrsCkT/c1idCNfe5hga+FCTftVryWPTL5OVKEH6vYHIJYCzpZ5bL/v7OAUjuoBExT60ubW318l4MWSjoj73Iq4S6898E+wxH1U6BJWzQ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RWwonhorkIXOG/d+wUJMA1C+fLCVEMfu8Efa9V52a70+Z61yRFgZNZMqrlcKcDRH4PkZrifR2c0/owjRboh82FIoSQgWuywrQdpFDKIO9jqU4frWivzp/ja8UAhkapPQZeuGLg08OR1yTFK2OP6euw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1ba1cefc-2028-4387-5471-08d98652f287 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2021 09:48:26.6231 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR03MB6328 Subject: [FFmpeg-devel] [PATCH 3/5] avfilter/vf_morpho: Take pre-padding into account for LUT-reallocation X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Vc8khzpvcB8k Fixes heap-buffer underflows. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_morpho.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavfilter/vf_morpho.c b/libavfilter/vf_morpho.c index d5c4801006..8c1e084e7e 100644 --- a/libavfilter/vf_morpho.c +++ b/libavfilter/vf_morpho.c @@ -320,6 +320,7 @@ static int alloc_lut_if_necessary(LUT *Ty, IPlane *f, chord_set *SE, { if (Ty->I != SE->Lnum || Ty->X != f->w || + SE->minX < 0 && -SE->minX > Ty->pre_pad_x || Ty->min_r != SE->minY || Ty->max_r != SE->maxY + num - 1) { int ret;