From patchwork Sat Sep 30 18:02:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44055 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1204:b0:15d:8365:d4b8 with SMTP id v4csp513008pzf; Sat, 30 Sep 2023 11:01:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFEdJ6PwMu6n2N8WZT+tM8wAiFaKd6MwUlyTV1mtaxEu0ooJxnPQoxrx7pXR+MgqM3xukDP X-Received: by 2002:a17:906:76d4:b0:9a5:ca42:f3a9 with SMTP id q20-20020a17090676d400b009a5ca42f3a9mr6248658ejn.2.1696096883479; Sat, 30 Sep 2023 11:01:23 -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 ho13-20020a1709070e8d00b009b28ee31a19si12038058ejc.248.2023.09.30.11.01.22; Sat, 30 Sep 2023 11:01:23 -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=IxOu3kGI; 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 800DA68CCED; Sat, 30 Sep 2023 21:01:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2060.outbound.protection.outlook.com [40.92.75.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DCB6168CC75 for ; Sat, 30 Sep 2023 21:01:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RDRZoWPR8CZFMsQBHkX239B2/xDQZnp/yGUzhUKvaq0D3PqqSYJTH1zxl09gIzw7gTUKlblOEpXuDGmXeWOFm1reqH6WqITHBc8ZYNi2EQrrrbuHyeXcbkK86bbQlTkK6VQCOlh0Kj2vWRiTaxDLl77nfBYXCg7AKset44OUymwbIowICT40AkNYtbz2dGzLXuAAj/jWg5tvfqg3Wb9nlcb5eY88S+MUs7b/EoSLt6OCh8dJJr/RkLiZ1lO3lk6OJqdflNTG74G24+tIK5mtR3M/y/ziTq4Pw9H6SYcGzfSpokx4J2n+5sQKBYOJ6pPkI0HTaCRU23h3nvGTIugALQ== 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=URmhj6PCLDotRK3ow+Ht0TcJQE+ttyTLPeeoNTEL7ro=; b=YB9BZoOCY9T045yShyi18KMk8o4WI+NsdJBDtiGWAeDKxioDf5oPrQW71efBZEoU8pOI/yvVMHiDTujNEnVP233GgnrmgcdTst/gqoF3RpAV0oX3E6dAkOJXIU/9pzfbJB6mCaDVt9rpCzuSjyfhYSKxXCbImxZjwmA4RxBT/C46pLniOL7uFN+43hladKtyhXqcAM/j35Pkj1XnTPYgZoCh1KUc4Kd88mFkDY5Jx75Jmsnet/7ankMawMehGnN7bSl+vo4Bz7cRCOCJSnTYZ9aoIzBZBDovi+F/qmXTwsg4S/QXkCBgJhf28MbShgamUQzPPgm7GHKSfaKG7k8rZg== 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=URmhj6PCLDotRK3ow+Ht0TcJQE+ttyTLPeeoNTEL7ro=; b=IxOu3kGIS2KOpnDnKKlWrwQk36gnp6KAiEKUi/NfUFpABljRSqEfZccbPiSyDo8x03sc6XoVMa3IFOzFslWb5vdekqshqDus5tr+Tm7uCtvwLp4778bfE3jOrWTsLbzQyaS2s95sTvFMnoR019mVpPPgFNJ/OTYWfOxjxip7b/S6hBWbD/v4i+T2t+KoVXrOSy4+fi1H/KI+qdlQNVrHZYQA1MZh9UeEslTuURjt6CHC46QFx7E45n8BQ07IRKU+NbwavXr0DcP3yhp7JOlIevBbRNgS2Qmf8y7G9wVSgrjDpfsLRiXXR6msN3pkEiz8Kj66ov81anOQbo863SgTgQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0247.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:32a::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.28; Sat, 30 Sep 2023 18:01:11 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Sat, 30 Sep 2023 18:01:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 Sep 2023 20:02:17 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [aZx+X4e+96sLhcCHMmgRtzoi2i+PFf16] X-ClientProxiedBy: ZR2P278CA0004.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::8) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230930180220.2938224-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0247:EE_ X-MS-Office365-Filtering-Correlation-Id: 0a3b7308-1a69-405c-57cf-08dbc1df3ab7 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RGwcQaq6bIKx8GGS0R0GCFsL/QApWZOXIFuBTWY++OT2Wxvyux79fw9vjTm6yhx3ZtfpY2u9fVrszcUt1F0gg03f63IBFXSoGww3inOaO9Hxldx/uCUNHhGmGHOvcJQVkl9NbBh4IhK7COms62OTcmOBJD4u7T0z9bqQEVXnISIQMRqxqVm4eIDr4i2lJA2zU3R0RPREUW375ql4b7FvQo9jcJJqOJbS9gJAn+hk1p2uAS1C4fzk0zjeAQYCcp9JgUANgfbKfMr8x81x9NQqtes4G0okuh2zzH9L+UCyOPuCoG47kxL6SS70QCLK15gw+2su2Xm5RJq9DXsCTKmCkW3Z/pG2x6U4EkQJkvgCWGMW80MBNBHX+aHQD1BKRf33dkMZZm/Op0zyz58XKyXtQO7BRLROHxIBPv0TcTX16AJPSNpFlSqXMdd6FG1dl+WWukXLb+LgdJ4+I/LpRpi0QeDjMifokfKj2Hryo26MuVKWU7JUJXeiuatHVkkpQ0gKu7ldV2+YB2bJtMjtatiS1YyvQpVXbAXqw4nI7SVaq3Yc/ZH/Z6gwTphzIM0qaPkDYJK1FMyBapE4I8ZinjymZrLYmEihGHcbkIhgzqCBwQc8cuHDKBBQ6f80v4lg7RHl X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: K0nmvjLyjTNGEqbs6lI7FjNmrnv2tDux//oW2ZoONb9UXy1iu8vvdxZnb8lflUZ3rmElM1U5J1v4rUjwn47m+nOtvhrj7QKKn9tykEmrfkN3I7qckwEhOcdNiLnCkDL5WRhbuZx2M4UkU4VyLwcqSCDbrEWWi04fbhxCmDiOhMM9kzHphXwXwg3R6l9IfqgXtrw3fHT3fMsa79mB8q7t5bTSr7X5CMqqGRA3sbEcSeA3VeCDrnsex5JtPSF+b6CQWyxFq9gSyPHkyP7XI87SoHQwlAVBEmxzX9JjTr2K5he94qAtVQlZ4ngoQt3BQLB4Y9a4SmTxuYtbPH3mWBEA/JezG7RIgd13o9Iae5MvufKBVUwFaWBh9hJAZd5BLkHoTwge5ml0HsRjvCuHtd9hkAtQaj9D5gSTY3rH4/TzDPz4/bLeyX2eI4dcxMivoCwfWam66Yob/A6i4anGsFFvEyghqQd/XtyT52u3iWpmMJk2ylNeZ3eZvIVI01Ceq+7M6tG6d1t3ZnjKXQsJavQe87VyBIj+dkrNguE0rkRYlctNJ8pSrHDiKOxSz/In3d+085iWmELopl57g2VZTBcuAoxsen5ToZ3GUDlrT1O9dZDGjWJ1dOi5KhuJWEj8ns39/jjZplWSPCZtJrbjuzJUZlYgHTpn7kG8+MjC3WMCffKAv+0bgtK/etSdGh6zvkLpC7igfzas0U+pRL25hhA0ayyx8t7ePeGXkkc2uRL4lCuRFn8lmWrBNaj0/FdF5uoITQfssWqb8HRU0JcnYyzoJH1IAyq7WmaZ5Yio5DGyn/KjUedCs3LQUiXpFiQJeD6a47sClIaRPnApBCIj7UHuGlSJSRg8lyyPEcnzfV54YdR1T5lRRWs+FmChU/UAH5OWNhy5mcfg3OWli4riZlEwprXPIutDuBvH6JSAFgnZS/7WJEzpW5VdBVLww0WDJSSnjPA2KjoxajjtK9fO1oit94JywU4z8Xr29RHB+xyGHMYcZXIA2iZ0AQIsgCH1sRWetzJmlGCgzyWvcy44aZsMGNKhizSjMZaagdOB/fsgG9KfPJ72L26WDM3gXZL9/EUmKejJw6w7XgK9DuvA+nzBOZMGZJYk+iRCnm0Bi5fdqmRZgJB0egv4RhKU8tVDwCoqlTaximE7Mi2UhEIa0zNp3xKcQHLP2E20ZVOdRwEz5osHUcN4HqDJ3ySAv/8qswqzDXQcBBXJ1oXhscw2IFDye3ugl7DGvgcD/zrMrCKbPJk6+yvgJpW3jl29FSgesNgU X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0a3b7308-1a69-405c-57cf-08dbc1df3ab7 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2023 18:01:11.3591 (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: AM8P250MB0247 Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/mpegvideo_dec: Check for existence of planes before accesses 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: LmqVFRnwsmSE Fixes segfaults with -debug +nomc -flags +gray (presuming a build with --enable-gray). Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_dec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c index 7aa46a4e25..77d90104f6 100644 --- a/libavcodec/mpegvideo_dec.c +++ b/libavcodec/mpegvideo_dec.c @@ -249,10 +249,12 @@ static void gray_frame(AVFrame *frame) { int h_chroma_shift, v_chroma_shift; - av_pix_fmt_get_chroma_sub_sample(frame->format, &h_chroma_shift, &v_chroma_shift); - for (int i = 0; i < frame->height; i++) memset(frame->data[0] + frame->linesize[0] * i, 0x80, frame->width); + + if (!frame->data[1]) + return; + av_pix_fmt_get_chroma_sub_sample(frame->format, &h_chroma_shift, &v_chroma_shift); for (int i = 0; i < AV_CEIL_RSHIFT(frame->height, v_chroma_shift); i++) { memset(frame->data[1] + frame->linesize[1] * i, 0x80, AV_CEIL_RSHIFT(frame->width, h_chroma_shift));