From patchwork Thu Jul 22 08:04:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29006 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp309761ios; Thu, 22 Jul 2021 01:05:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzyuhfeupZleNIJas5IQE13snVpk/E/C3+UjOeFZeiTT1WuajSuYLYSYk/pgmmeR/jDBFvu X-Received: by 2002:aa7:c545:: with SMTP id s5mr52267440edr.182.1626941100933; Thu, 22 Jul 2021 01:05:00 -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 qa18si1949054ejc.491.2021.07.22.01.05.00; Thu, 22 Jul 2021 01:05:00 -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=LAKGAtFD; 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 BA5B368A8F1; Thu, 22 Jul 2021 11:04:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068093.outbound.protection.outlook.com [40.92.68.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 53E4868A21C for ; Thu, 22 Jul 2021 11:04:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HQ9KIi0j2Rp4CZbWyTneGallDHzaBEiqrViTQlvphcbuPEX1EMaUTZwMzrK1EauAvOiEGkSQrZzlV8YdbtveW/K8/i7Gj4qZTujnIZH51WCFFLNcxIZ7ZX7TqE3342Bfgq6PlVIINRQ4WmLimPKDwpRl8WqZdC4jvC0Bp5E1wyFxaZlTqd9rVDlzqmn91VWQiScBFZpc9LPZroPU9HhQcQtLo0ku2t3ZOXRyp45oQtiUXoaTJAw+5vsvesXP1YJKE8rvlMAIGmUpOYmo7ewcpSdMoWTae1PAu6fmZdWQcdcf18oJFFONlJ09XHkkQQ7T6cK/xEbvCQE765InA+kfaA== 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-SenderADCheck; bh=c/PhZvh5L0VIOPOTPljAuXuqMeDBFLm9aZoYpSIhkkw=; b=hZg7ycPr8v47tnHzi+t4wQWJL9pR5BEb+BZbbUnRXQBKO9+4wmYukWkYn+MXHxAZ1lp/5/wAZ6ifSNkWpE2LQ8M75KUFhebCqW87xUfDbwQz3o9nAkcWJSX/e3zxU8H0c0J9s9CLwJA/HmHec4bX4bpjalIswf2n9D1ws3NOGcXsbnaOM4MSJD/R6NleeO15H+ARFFHSAvvmRJBRyW9q7g7dQZPF2fYYT9ZgfqhUYcmcxN+kA1u/2cygLD1Y4jV0nwS54MBsFtyXMt3Ko2exPRkX4ERLtyV1kI2Gi7WODUXX7uhC1Hg6V5brwaCVYh+FMvPyZ+A9n7GYYMbJENOIRQ== 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=c/PhZvh5L0VIOPOTPljAuXuqMeDBFLm9aZoYpSIhkkw=; b=LAKGAtFD949Ly82kUv/Uclthgu83n35tEoDyQj/NgNFPvRXSTHD44WSBbEvcnKfoBnLrNTtQi1Xppj9laXuK4rCqBPA+FUWW/jdtAdkpDQYwGRIJ+T3/WAiFXKKyVmiVOq1/j5wunC/wBVN5uOzh7ef9rZwpbG3RD5ONMGHUxa/h1SiFS3jJwH/phfcy+zaXMmqq/Yl85aLDdWPQKe4DIuSAupuGmTp/UYc8Krbm5zm+/ErYsh+7IMwwtHVlRz7YeVvsTsuM3c9gJzvBFp/QRwM3rULgAxeC7tDKiIQ7trQISlsz/HKNvRpeFcBD+ycsEA29ghms8TriGXtft5uNoQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7256.eurprd03.prod.outlook.com (2603:10a6:20b:2e1::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.25; Thu, 22 Jul 2021 08:04:49 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d%7]) with mapi id 15.20.4331.034; Thu, 22 Jul 2021 08:04:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 22 Jul 2021 10:04:41 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [w1rzvJW2XLWAruZPKgl+71yvCDknx/WT] X-ClientProxiedBy: AM9P250CA0009.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:21c::14) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210722080441.316740-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.94.230) by AM9P250CA0009.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:21c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.24 via Frontend Transport; Thu, 22 Jul 2021 08:04:49 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: db8330d9-b43e-416c-fac0-08d94ce760c5 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWl+/UfUEpuNHspudDFEo3CNsgUKW8h5GF+29XBJl8lxTE8OpNbl/NVIXVibJow9OrAAEt7V8dBYmY7OPwXHzR80JTUlC9enymepWhu783duUNMb2DRjimhIjY3JcHXCXmc/XO1/0GCczW/q2nIAcp3oK6IMjJr0aSfuLY8yIW1E/Pb+EIRezg2txFCtDbcFqJOT48ACgd1+qP2bPn6Ej0UZ1Im3T34Nah43SrL/UYZQ0oEqc1b7Ty3kf5g3WVEZj667ZDLuqKUKrRNlBCeWPYWv/RgNaZNsvDn/d7k8atDhLmiYEWwNvrfdjJ52MFG8Wgi/yFgkTQFfY+GRsuKwSUi9IHSEXgbqZADrZ7Zkh94TIOr5StImnzvfj7Cv1qRIZUHSC9a9GhARgZpwxCi69TbZ5FASczZwo7rBdt/KiE88yJjaWc5ByGs5YOzWsA+L2M1yH9hY/AFrEoARcWTR3duOp04b2MewHhuMzwhzczSpuOPxBoJLj9dkgcOcbu3W3MWik6XscQurfUxKESrA6IZMjqmUAoYlnh4B1kJOiVNKBhpr9bS3mz53IIvNTR94VybyE/Kbo6SAFpdzz3p5A1fSL7PHIAsgn2kPqip+RnraouPoFWC82v2mv4HzT/7L4qY5P+xReuGORNjikk9EriP/k61NarqUXwUTsxbU3iQCQuuD9rvq1wTOWiU1AdmgC+YznzKNPBg0QsQcJOSEB1XesXDYbZnrpw= X-MS-TrafficTypeDiagnostic: AS8PR03MB7256: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: smkeP9TX0ubN5k0r4tNBv+s0aTN4ZikVS4txx/0QWTrMyzIIKfH6ic/KwQIUrwmIwQq1TF//ZO0vkM9avqunBU7c6INySV7YiDPqZBxw2T9/387rJ3n5ZxFAD1wiiLl1Mb3+wMt5V0xtglyJ4lBYRUlLquxqFwTXkqmeaWvt540f49mkiePpNG+8HMX9j7l0/JJfqFvP6Om0uIuzz5zUK+wiDv4XnOHbCaEJ6DCK8cYx9cieaJVa4tO17mZp4ydVfs+USa686OZ8sdWwYhh0UBoiNJuj3qIBd7gvueAiT59XkyIe9HftsdxYahW+KVhlnx3jAvmm/i3rXBKw2SnJ/ln5LKftVhmKgYgPFB47594yOJ5a/RE2J771F3Tsxw3y+8FYZcWzxj2zwlK1W+xkfl8jOTCaFjBxlhYcp/aJb5tPLqX3AyTIpNX68g97ayfd X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /Uaf/5SDkZ0IwMssfu1og1Pl1IJwP4f+8m0XDhglqAfN4s53rp5x5hdWvsH802yQyDg7mwPw1JNipB/jG0cSibH88X9kDmFTapcoxb1EUGttIC91fvU9iE47J8ULqLUMRIVpmv9M6c8uU71uDg7+gg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: db8330d9-b43e-416c-fac0-08d94ce760c5 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jul 2021 08:04:49.6888 (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: AS8PR03MB7256 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_shufflepixels: Check ff_get_video_buffer() 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: aqy2ntUvHnbK There would be a segfault in case of (likely memory allocation) failure. Fixes Coverity issue #1322338. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_shufflepixels.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavfilter/vf_shufflepixels.c b/libavfilter/vf_shufflepixels.c index b404eefe66..b5e757c929 100644 --- a/libavfilter/vf_shufflepixels.c +++ b/libavfilter/vf_shufflepixels.c @@ -377,6 +377,11 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) ThreadData td; int ret; + if (!out) { + ret = AVERROR(ENOMEM); + goto fail; + } + ret = av_frame_copy_props(out, in); if (ret < 0) { av_frame_free(&out);