From patchwork Tue Oct 5 20:53:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30908 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp5776462iob; Tue, 5 Oct 2021 13:54:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwXoLBxmNdfpBsITbMX7YrCiZdArTQqmKZzAi/nCRi7GRWog7EGbrA2EtU3iyH+iwTZnK46 X-Received: by 2002:a50:bf08:: with SMTP id f8mr28004373edk.400.1633467285287; Tue, 05 Oct 2021 13:54: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 nb20si4346695ejc.49.2021.10.05.13.54.44; Tue, 05 Oct 2021 13:54: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=Lrq7GGvu; 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 DB82068AA1F; Tue, 5 Oct 2021 23:54:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072058.outbound.protection.outlook.com [40.92.72.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6DF2068A9DB for ; Tue, 5 Oct 2021 23:54:18 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E8jheW4hJmjlSoIgB8efLAxdo6PUSh44IeulPhM/mI5ZNHGOrAQHQN15/8OGaT+Varf51SH2oAmriaOKlua4etdfVmiiluY8Z4oRbrESKuyKscle+BWclgIk5qYzIANSHisQccHPjXGlR/yRau0sCXRYtm19qcWN6Ijo/Od1zsY8aTwKFHpS3j4o2DHF49w58dCm+Xyo8ADEwLiviHdYbTHZsj42VwoxIxkKwSTZcipKFvX1eOn4+lrqwvAsp3a0O13egma0rcztrZBZlz/S1+qcjuECDex1qUo7nk21XyfXzZa3ii/3L9qSnZm/Dupr83xs6+AOljviJcF2ThtGJg== 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=cCghutlTb71byMm9+GhDJibKZT9aGeNG5noG4IA1w/I=; b=gRMOFaQg4CE9jAG8hl9mCQAyKI6LU/3xpZTBCABAbwk9rZKHxEJH4ZxarIzQ71jcpcY5+1TL4lSH3OzHpmKJpMt+gN28Lbg4MFIsEA40Iq1H+0swffzwp8pwBX3oZi8ajT8CxK3QesxJuNm+VGWSpM2JbYVW3BNMF9YGGsTrdSWUe7fNaAPOgaqE0uugVSdcdtEsp15S//1Lk0Wqu4HCSyhH0QV81nP+5OsU1r/SfLSo9bcb4eHMlex/keWG0uPSa/5cqSudvtn+DUCjlUS6Qsq01/THowBmJRM6uH5aGzXzXL/soxMlcZG+Z4rGVDBjIjlXrHxygqYv2dJjDFJEWQ== 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=cCghutlTb71byMm9+GhDJibKZT9aGeNG5noG4IA1w/I=; b=Lrq7GGvuxZhD99nAuEmLzxMfC9y19zoZFsd1KeFUzEib0vnR9IYTwTKndJNt0rHZXxgG7jyIBRoU0YMKJdDLU3ymcW8lV9PBYBbWlBTQW91jtQej1rC176S8ggde43W+qyH9BXTxjOJY69ZDFHpqtB1H/kTP4BZ1xSV8iThVfsPwpwfa1KzIiyzz8Utu6tAyaijzbP9coCdNFJq+E6hPclTvDynpfm1zFpJeJ/oeLEvDkZbnpD6ZkWNUiFVHV95DZRYm+hBptN4xX5IfBewk1TcK5rSc1Zos7zfnHBvX2DJiGvUvZtbrsCW+yCBLzGwu8BXhfvaLqoNwpEfgTxIBBA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6184.eurprd03.prod.outlook.com (2603:10a6:20b:141::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.17; Tue, 5 Oct 2021 20:54:04 +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.022; Tue, 5 Oct 2021 20:54:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Oct 2021 22:53:46 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [6VjTEmkl5uNewItGjriptQRMCMQXoCx8] X-ClientProxiedBy: AM4PR0701CA0040.eurprd07.prod.outlook.com (2603:10a6:200:42::50) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211005205348.519944-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0701CA0040.eurprd07.prod.outlook.com (2603:10a6:200:42::50) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.8 via Frontend Transport; Tue, 5 Oct 2021 20:54:04 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5146e3e8-5dd2-4063-e6ec-08d98842442d X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiS+KSxcjYi+gKEA6YP+MkHetSeyfcSE4HhNSlC/jcFcMUIHXEDhoxZwJGjZrnq7vmnickG21HLyG/otm3vZvKtbJyQLMoz08PZyGEs4opEZUVX+relb6IRGbqHdHArQuXTB7g8+OOt+9WuC3pOrfrbLbo354CBVT8YuT5XXmaRzSIBGSaVwOoLdKC0/WABJtHO7DfOmsAA2FkzcuUPLaaE8Y6dji5EHNXik5vD5NQD8airc8TK5glxLKuvUvhVLBUtyikU/ja/jTxrTU6A3/8APbfRL+eDPntPB2vjP0NydZJghOKPSJh8vT0iwehK4Lyx8+WmYsmpD9pTPEAgafaJln+wSvRkTauqh0wbRww/LUam8iJfWWZMoM8GDEJaGdFWz4iQI/mo8IaW4XvdY71YwCmTwdjxkUSYHWx5wNSX/s1c8acBlNOdml9fWgAZX+iR86P7hIiqXx4OiL/WV4OleRLLq9mgzIjIiVmHjbXvJoh5n0qPOwYXJ+ydmSiBFhrR4SiCF3rdrUe1uZCM2ZqCmm2EYniFz35VDQTV7iXw64zo3q9DpiFP85CsoRIoF+27QR4iriCAqStdDH0QkT62wszLS75XzzKn2Z5HTTqP5ihxubay+ESkqqgEqykGFNOHUumNsclQlxrjJmKbVkunJq3ZieY9w1aOH8QjKXqEwkNSj8ugZi3QZNMEIMxQXiu5AxonLJcP1cFqBP8k7FHkHJGTtCA2dqKocO9lmoy7v/9w3mr3T4gw9SHcmWFvB0mw= X-MS-TrafficTypeDiagnostic: AM7PR03MB6184: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: T6Q2YazLN1n46/W6VjvpAzIb0AYW0r7td3gAL856PRy8nqdnHNplQua75NmsSBBc+MA+0AHgthfsWlsDVy3Q1KYKKTC/ewBrIJmuLDK+CgobCp9oN4wBqxk7T8FaNkjUkhzW+8B0gLM6Ctimb+DuV6wwI5ZJ+daaiwTbozK4qAavFSbT+ORgNPOmxsiQlZlrDI06PMJrL2YyBP2Wz8Zd69ek4ITUaRrtEXB5MsPG2URfxHWIMZJS58tpbU4sr4MZl9+yTRVpnTiQbDt1Hu1z2/wGDZRtdZLTqkDh5uBnV8WTAuDP5ZWbm2zo+WgN+9+LZXpA+vK/QM2cc+j4Bx3luhWhGXSrmbCYGE+oTOod6lVK5WfhSrMC1YS76AhUoLCO0+1UhpVoUOGy20PS8ov4MD/vQnLk7GnD3atTpyb5BAb0KgjSDYsluKfqH5bVAPnj X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EZ3gDLXWz2gRFFmthQCYMPK1/0zUZHd04WfdxGCoRRgMWzYqA0wJS6v+VpuIlGPsUM/cUqI+o2iVGAVLkRJ/ffdD/k0sz6FtoWUMPBKPjQ2SrTWxp2eW61jEwdhgD7UpHGOKG1y1cZuCFJD9pqrqlQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5146e3e8-5dd2-4063-e6ec-08d98842442d X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Oct 2021 20:54:04.4555 (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: AM7PR03MB6184 Subject: [FFmpeg-devel] [PATCH 6/8] avfilter/tests/filtfmts: Check for existence of formats/channel layouts 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: WyA/9Dvn8u2J Fixes segfaults with filters that either return AVERROR(EAGAIN) (or another error) or that do not set everything and rely on filter_query_formats() to set the rest. Signed-off-by: Andreas Rheinhardt --- libavfilter/tests/filtfmts.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavfilter/tests/filtfmts.c b/libavfilter/tests/filtfmts.c index 07e387b92e..d793480344 100644 --- a/libavfilter/tests/filtfmts.c +++ b/libavfilter/tests/filtfmts.c @@ -43,7 +43,7 @@ static void print_formats_internal(AVFilterLink **links, const AVFilterPad *pads if (link->type == AVMEDIA_TYPE_VIDEO) { const AVFilterFormats *const fmts = cfg->formats; - for (unsigned j = 0; j < fmts->nb_formats; j++) { + for (unsigned j = 0; fmts && j < fmts->nb_formats; j++) { printf("%s[%u] %s: fmt:%s\n", inout_string, i, pad_name, av_get_pix_fmt_name(fmts->formats[j])); @@ -52,12 +52,12 @@ static void print_formats_internal(AVFilterLink **links, const AVFilterPad *pads const AVFilterFormats *const fmts = cfg->formats; const AVFilterChannelLayouts *const layouts = cfg->channel_layouts; - for (unsigned j = 0; j < fmts->nb_formats; j++) + for (unsigned j = 0; fmts && j < fmts->nb_formats; j++) printf("%s[%u] %s: fmt:%s\n", inout_string, i, pad_name, av_get_sample_fmt_name(fmts->formats[j])); - for (unsigned j = 0; j < layouts->nb_channel_layouts; j++) { + for (unsigned j = 0; layouts && j < layouts->nb_channel_layouts; j++) { char buf[256]; av_get_channel_layout_string(buf, sizeof(buf), -1, layouts->channel_layouts[j]);