From patchwork Fri Aug 12 12:40:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37245 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp973381pzi; Fri, 12 Aug 2022 05:41:05 -0700 (PDT) X-Google-Smtp-Source: AA6agR4Dale4jwadGXIIlCQNYq1Q4RYq9y3w4pvpOP5gzWyuJOZmx7rOxPcKbtJFMxgVZLZwCWWB X-Received: by 2002:a17:907:94d2:b0:730:87c1:e86c with SMTP id dn18-20020a17090794d200b0073087c1e86cmr2610289ejc.129.1660308065308; Fri, 12 Aug 2022 05:41:05 -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 hc12-20020a170907168c00b007316cc27ab0si2016879ejc.980.2022.08.12.05.41.04; Fri, 12 Aug 2022 05:41:05 -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=fAJqryWx; 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 A07C768B926; Fri, 12 Aug 2022 15:41:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2067.outbound.protection.outlook.com [40.92.91.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1FA0368B69E for ; Fri, 12 Aug 2022 15:40:53 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FpZJ5YyVqpaWy4V7FeNv8uv2YePk0iVDSGwsVcHNUCU/NlscXnNObcmSEjQsv0FlIQBg9BrV9SYEcmOFPugMDIWkcPnInr1FcXkc4yk1/21rj/cAL/xo2odLqSoipBKzOMI9bGCIxwJL1ymW2Ble22gOVQUSpTYzoTDaQa2iMEp3jLc8ccSF2H+JuQlSzf5QTTTwNFgGb9t2rYLFi27PWyS+3BU97cVusIkD0vRUMaOOV4q+PKSBZxsR6ier3x4mXDK+J2BbP3aGrEqE+ggGDBGpc5Ni5QveBf6+cSvSEY6QMvssjehTyWuUn2cTCThWwyLUVBaf0h+M6xAThcUwFA== 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=UyU3K0pwNTjkoWA/p0pvRkbDwpxCBWb3rxJPR3Xq/3g=; b=kmQq11L642i39B6NjqN158Z5knOYk4abDebOnAnycjF1NrcT5kMCgDjf2Qeg8mI1Lz4Eotjyfs/ilplwt0GxHYYYacqXTN4LxiS7AxtAN+vGuUPEd1pYxD86SzuKKYqI4Mc2zekqii67feaomZIaqJSEhdJiaMrg/YShVQlzLY/pzE5x0H1iNAE6knoW2OuLLtNUMUsOAH2Ip/gYdGm6SqVJULBvbeSvz5evrDVahICDX/DLubVUoGRNFoFMDwAooaAHWcWI0li63e62dpM34z02Is7hs7C5OIzQE7ilr/LQAx8XfIy5NJdqB07u0K0Tlaeu2fTwoArIAvoYa8iwUw== 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=UyU3K0pwNTjkoWA/p0pvRkbDwpxCBWb3rxJPR3Xq/3g=; b=fAJqryWxEHRttF+MRprpUFHuXTtBzNT4mbJg18C4w+WhxnR+unRpr6H4rgWRajLdeFrZpCusVbogqQNbTT/ZTL7Y8eL8Ys3jdqVgCsYTnKkn+aiTLxMhqn2xyhIKhUvUTLa4QoAJVgzC9fWM3EruHTP3+pgx6muZxgps6l68eQR0J+DM354+rrwvLhb21CVVvwA9Bj+56xE+eevvVKkcQFkiDaTa9Low8v/vF231npA/yQRMHxjXAo51rE4uP5EVHAgXzZdRXYkI1iFFNaEXlmmWsiNdERoM7/jbSTwSQYdTEPy5VoTX54TII89wt9LRHGVpU4ghBnKA9jez63Tsbg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM0PR01MB6484.eurprd01.prod.exchangelabs.com (2603:10a6:20b:163::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5525.10; Fri, 12 Aug 2022 12:40:52 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5504.025; Fri, 12 Aug 2022 12:40:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 Aug 2022 14:40:43 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [KHLUpsN+urY/dHjizBFa0z6gNSuuVkyY] X-ClientProxiedBy: ZR0P278CA0063.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::14) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220812124043.5987-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1e2c3acf-6454-4b8a-da90-08da7c5fe36c X-MS-Exchange-SLBlob-MailProps: GjjEsbJCp85zLMi8L8a48RoipNW/uSZKxj1YVkB8xUEi0biKy6Dt4dis5KOEPPXeuLs3WfVtSPNTMyssT2MvLI8EVsG/LjnRi4iLOZ+ZE/VPzUCuw/ENmHRxz+fNkIvNvloPxWXDBw+e44P3liiDPFSlciBeQxQ1NENImh9/t9p7IowSya6tHv4lWTsXOqN5rUWSKeIr+ucCK1+qTIEMc45LkJrVnsDIU1q81HbQJFggnCdqV+gPlhGvyEkxTMwyMvvRjr3lntj61/KAgKYDTjlS8SFLhE4ZLtUZBc+4PFKSNVk+cVPDjSgB7TPTROOJtKl6aaiXiEuBYtc6brRiXecN8jhpIrR6MM5vsfxl2Mzkw4DBEAmElg43e2Uv/TvRpuWB2+WwG1QDjxLUSM1wsKlmEOM1qqJvMwQKpwM+St12gWeDXNPwK3pitFuEMkIWO4+4Ym61LXQhCgELWdAxdydW3Q8EAyDizC+CrMGlKfGCknZlcmb33Hg4Xb77VhZ9MuU1MyEVwuQb0M3xnA7VBWbNkKrvk4vC/hQNWudv8wzvRbXJx75UTwIg7YC8vTQ37RUF2PWNSp4Roiiofp+EjxgVFEwERoV3ifpQKbQQdXjNN+YMOEszUVOwE/1xDRQ0fN0cWtRWPaR0GtQj5mHkTwEP0X/6UvqmJ3Wc6UaZmL3/kcRKmYDObZrQF8e71DZkqMzoo93UOhPFIubAQooVX/bMKWaWd7p+6co5FHJ8pRXJMK5DCziaoui5afYh6oFE9OQmGzfuXmfT8WW+TT/vlwMyW/nJuQwL+JAjargfdo7omMalihXW/cGEsmB7Lh4OSu6S494P6kaY1kiMKjRa3Qm6TKgN+HRRYWD8U+T7PHiWpnyE9gpZ3A== X-MS-TrafficTypeDiagnostic: AM0PR01MB6484:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FyZeh0z3NLH95viEVVrpRJun/WhgVWSR6EW43wc8+XKr2J36DToLGaiexSc+M8T2Udubt8yWYG+4rvsHH3s0jkz6amxS+klgyX8iVNcPX4Qxc7roS4Sx/YlaGYf8fE9UvULKM2sR/WhDJS3uNeNBi462wEdcnL226nPcia5Ol8/ML3JIh9pTKYGjDdzxc5e9vTmScplbnG5FTEZLOzgzyG0AcieHj52ke+3SM/31XDFz3szjK/U8LhE/O46wDRRJOpUhcNI7W2NVi/NNeP2qBERGb/6TFr/6TWxAtd8O2ubjOaG57WbqQWvF1wtS4cl2Phjqkce7eQGOxDiQP4SNLSkoAxP6LiVs86K6KcBTF64XsivWa9/9xF4wfXE/LQFVKbyi6SfIaxoLB6yjCQ1T0eIF+2cUQ2W7LZ93zyGW2T0C/g85a7uhkYXV3blGfSMVPK5FhyjUulk+jZOg/fmOjfOce7fNfzYGEkWJuIY9q8zH/xCgHfv1ZmRwyLHovmiWeYiY8Oc7fnjQCjYvnxRJV+p1G8INCaaM8A9YlRKTYAFeb9Pb8nbTCMDddIpMYlDCzwRklvn9yJ6v8IXKVTEsupZ9TKesCi/a4R3MOsEW6hnCMFpRO8ZZFdeRDS/pnsEl8b9xMBCtTPQ0UoCW0cniRA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fmy/L5nIZUkszcs/FfVrOy9PhpuI8+1JQub49XVkkS3y2+BkDosFIplkV6gGVgjOgQR1NN8TEP4QSdQcWRPhQEA2Y0f6UjUEy78xn2p2ltqyzP8QnIlRv8HcVJcCoan+RCqppFu9VfmivWiUR8t2JsWj/idKbG8NXlr7tL8Ic5VDbcOwSD8d9B3f14RsAb17s8bGxNbL8GoL1H4K9WZyZ4OFzl75HAZlmZa5KZeJ+aeb+fFMkdF1pAvs6G+ltOfB+5v7VkhxLUnD2tDXa7s0c2h6OYuWLotoyygvhOsvM4K3TkndTg/fDKLH0GATfc5UH9Y6WwvhSg1KfwXuXvaRoTa6u8lWHTW5B653irWiG6ItNPD/J+Cy7x4qYsuVFGazY6MZyfJB/cmCc8WiKrgZmd5nVg04ekc4umT2KxPHW42xAyREYN40ptgD9aM5lA0hUPmCxpEOS7hXMGI9QSotm4pN/HMVy/tnslUwHAayqN5Tyfpsj8mqHgeFiXexlI3LvaeZsfG5ne6P1zcmbtAadbeujrLWDpc8z3WFEQHS2lKyUeBA5NG62jwBmjfyJOAX7ZJ9yUdTO0q++aDMdzuxFU5jpo4G3e2/cfqziLJK5/1zN5PjVU7gRqiX2RuW8YwdtZJFmueZrbo8zMs2WhU/8o0lTDsPXxdo10V0H+Desa3ZAt8pSSqIGsuaLerPljyisVM+Z75Umbw0/+CSFxC6knEifOHftlH4GEiXFib12SREH3rfU+N7/EnH1MAzNu8PpFADZbtXn72rxF4UaZrmG+SFNPe8G+Q6cBresH/wKmrskhiNktO2puE8JbKkw3+TOKXbQifwtxDq6J2A+o4a1vwLwC/EC05WEU8wngQZQXCF4x8rEV6IT8kVWC3xQpGR3GnaK8W/SH4SJSUddrF1LeAzvK1anBN6675C9nNOnYczMPPf0/+jQ9L1IDpdoAPQZSuHEjY4z3G7gFLfdSnXFxSX6gQDOQnI0/Z1As5TtdRf7RmdB73Dx07vBLg0kuWSJkaIF9sIx8W2eqT+ENyZ8xME6ObptJ01NK58NFOc+CI/CA4AweOmnOhvhvF6WM60OXIuyejgI0GQifP/Zt/xZqmivcl3/QfJjPzRubkG17AAcad4r8rNzxTQQ8DwZx/6INFQQ23RQDOeufuVKF39cV6hWeK/syz2S62NbusUcA8RjigXDH6O+Mnvj/SHflNL4r9crgZWnTvKZ0C0exyXplP0VAmXRjQWb4Igl/lFX/OigmxaKPAPMDb1W5JgijX71Ph2bC4CHom99QaIhb/tVXAAK4gOrv6eQNVXLxFguRY= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1e2c3acf-6454-4b8a-da90-08da7c5fe36c X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2022 12:40:51.0489 (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: AM0PR01MB6484 Subject: [FFmpeg-devel] [PATCH] avcodec/mimic: Fix undefined pointer arithmetic 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: NQ8na/MI/xhP NULL + anything is UB. Signed-off-by: Andreas Rheinhardt --- libavcodec/mimic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c index ce5c2afd19..bcf10b7ae1 100644 --- a/libavcodec/mimic.c +++ b/libavcodec/mimic.c @@ -268,8 +268,9 @@ static int decode(MimicContext *ctx, int quality, int num_coeffs, const int qscale = av_clip(10000 - quality, is_chroma ? 1000 : 2000, 10000) << 2; const int stride = ctx->frames[ctx->cur_index ].f->linesize[plane]; - const uint8_t *src = ctx->frames[ctx->prev_index].f->data[plane]; uint8_t *dst = ctx->frames[ctx->cur_index ].f->data[plane]; + /* src is unused for I frames; set to avoid UB pointer arithmetic. */ + const uint8_t *src = is_iframe ? dst : ctx->frames[ctx->prev_index].f->data[plane]; for (y = 0; y < ctx->num_vblocks[plane]; y++) { for (x = 0; x < ctx->num_hblocks[plane]; x++) {