From patchwork Sun Sep 26 06:40:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30583 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp3046734iob; Sat, 25 Sep 2021 23:41:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz/pJqcQVafFyVy3Fc5NBIruPxBTjlfplcqJBSk5Hhl4O0K8d6ZsgJu5jPAbsbqOJyC/OKr X-Received: by 2002:aa7:c744:: with SMTP id c4mr16024209eds.0.1632638486696; Sat, 25 Sep 2021 23:41:26 -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 q23si16653841ejr.192.2021.09.25.23.41.26; Sat, 25 Sep 2021 23:41:26 -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=FKUABg6Q; 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 BAFDD68A98B; Sun, 26 Sep 2021 09:41:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070041.outbound.protection.outlook.com [40.92.70.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CEE2A68A929 for ; Sun, 26 Sep 2021 09:41:00 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XtrZbvRWmnlz6z50pRWl7UxyRV+Cd5QawmhWDv7blqoyVnlkheAEENtofGPSpmlvOG3rjHrc0hcWTlZ7+34FEzC5Ijxu9HZDV8URhJIEWOPZt/lutJz8/HpVHT71Dl1780fIt4aluvHbJ16j249BOeVyrwtd0sT9vWpdgOR9GG4hAZ6BltyEMVd76IrvE0P+ZI5v3Q7e+7xDHvPY3QciwRmkcwH03/oOl7TuVpclwCjoxn2Blsan6S+1ZCNH5jfDbzqeLTWa/C4MUg6BItv+mUMop+/MzZVtvcxoa8PbL6Vset1bUnnK2k2uv3a0PQ0g7EU/KBGk2zQTmP5xeX80cg== 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; bh=607cDlkRnI5cHsuwly0175FyVnEhxg6w+f/wKd5j/iQ=; b=DM3WAsqeWdD2tVI5IfM1OYXqepivOER30dwBx45nEjIzH826MLNZesUwF90NZ0HpPKzAe6x3ja2VFvY7Ca6Nibb6E4OhfVQ76XtXgOmCfuD3OXs13xssgeKkapwqUt33/B2f8b8BglSuQeBfmgSdzMWTz8EVdpcilna0UlXb6oG7DvITCXcj+KxOv1mkaEN9SZFjZUY3JfvWewHIFysJ2Gwez9hws2Dw++U/dp88enNsCj7gP9Mo5R+3WQJYEkMhVbj7FN7zdEClfIAmiut+1MXId6JPJv72hmODIghzawOJQRj99Y+axePuN6MlZ+nhU4QyA+LWIyMK3iNGw08vVg== 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=607cDlkRnI5cHsuwly0175FyVnEhxg6w+f/wKd5j/iQ=; b=FKUABg6QbXRiFTdMRnVOmOnrtujVgyVyND41/n0h3pK1wpia7wXgq8oHXliKqinJYYQh1rCk8tHnNx+aTjq5BaSTb/+/D4V0BUTEnhU76qeQd5oSzHbezDPze3CM7FE9fUDzASK9ePcN8SI98nXAjanUg3rqrrQWdVmRph9XnIv/hyVRDK5/0mqdPgCQkUS2NLsEMG7a9hgzzazKzgh+bEEZQS0NUqr/ZvcQ7KRiK3ufryg7smBFwByTlLXFcoMKA+6OQvF+4mx4FBYFXb5LCy9VYMXyPlwuyuWsfqQ8MYIijwqrGed8fAY2R216/S3VxBYt2vvbC1tU0KYbs0ptCA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3768.eurprd03.prod.outlook.com (2603:10a6:209:37::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.16; Sun, 26 Sep 2021 06:40:50 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4544.021; Sun, 26 Sep 2021 06:40:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 Sep 2021 08:40:27 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [LZ1iMwRY4GcCQRSH/l6WxA1mXDI0tBT5] X-ClientProxiedBy: AM4PR0302CA0010.eurprd03.prod.outlook.com (2603:10a6:205:2::23) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210926064027.344398-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0302CA0010.eurprd03.prod.outlook.com (2603:10a6:205:2::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.14 via Frontend Transport; Sun, 26 Sep 2021 06:40:49 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e1d0d967-5b18-4f73-e133-08d980b89428 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWLGUKWLgTOP1tKS/WOBc8zEqGvdbBeJzYmM0aac2EyOPjDoXfRNyidI39F/6NBFOcGjIUmx/wm/XPWsi8rPbbFMP4X7++U1TWw0hEMQ8KvDlQ7lgD6YzotkUfpu7enXvz1aDRm82KxILQFNgf0YX+CQB6MRgoSJ3/GlRc5lQSKOalZ2qTQsg799JJMg9Z7gk7aJWas0/fjEV3g4haJ7JkInWJHHOA7gzYrXSU1npYgQIjgvCsdPhHvQP4DE9Fpwz/8XpetTW6/l1jJ+v3rpCjeuLNt7dP7Ojp0tUFmg+fvqv0Wm2wJi/lhe41U9f16im6hzH8TL0uzoP+vF/JE6ac7+hvP1lcmjzAe9rDrSAeDUKKyawPNvgsJ7WNRxcLYX02fmvcoUDwCaqeIjzbEnRiQZsKUNZrMCGAOck+r/5+7DaCqNxAD+WG0KIEMPO7L4dC4IyaNnP+mMc4KKCmrKz/mhuvrfSY2rtt8/C3q9MxKmQObL8C4PM6TAiRVbPHYWqnsSMfV+UhemaFsB8u6spQO5jmQizXXsWkOvpSBIJfvJrHtFi4HpXHdJh0mcbrPno5MiljumH44+NxEdHHczNZp0XP0v9LZ+yips5RNa/ldj68BITYCSxhNWW87GZ+SllD8Ctc/5e2G/8cxlBhgYbAzNOv5KmmGfvFiek1Xp6EHaDGKDHnSPjpKrS/2ztXdzm9bTc0sS0MrKihh49i8MMnj1OpM3XM4vl0= X-MS-TrafficTypeDiagnostic: AM6PR03MB3768: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RLDykHsmbTw0c0th3IT/mqbwLi7JxvsbZSm1ii44Eq6iNOqj0t6rYT5s1VDdWCO5/XM14XdMX6rF4LoBQWP4tu8ACAKmx5veJWF0Do1Il+qLfB9wfLwL1XV1B3vdT+W1qKuyZCTw6tlCcqzV6Xtm7xXpVE72Z9qdEEVCfqcxIfqlhSJC7rGNhzi3cBWJ2UDFa41PWhZDkVgyEppyDDr22WJgLULlMjLWUyYWrI46dQRGx57JZS7JShGxBmCSKnMn+CGGZ6fnK2LNBS5fMYvp7bewZLTFTFgW0Bogto8VPfESNj4IiEysxWLYUTFaB95i5/EOr18FEzAer41ZiiZON5UAg/YtxfER+FuqsDeVxCUS4jaRLg8VgvxFW83ec18CFI1uT3HBjbN4tTcBeGmorH4nSuPxvW92QX8xbtwwaeXKFS7XTw8G4qKB2OQvaf/C X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: G1tSgjDUO6j21Ns2C+Awkw0gqxVYyCnmF6J8XbVPg505Y9vqupRSWXrx4zsPhm2HtYk1yzd65fTI7ZqoD2NFi182knYf6SLfv5RFH0Vr6It+Lan3bY/VzMdXdNPBHqCQl+fn7phL5aM6hnjanO0zTA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e1d0d967-5b18-4f73-e133-08d980b89428 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2021 06:40:49.9891 (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: AM6PR03MB3768 Subject: [FFmpeg-devel] [PATCH 6/6] avutil/hwcontext_qsv: Remove redundant check 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: GDcM0gUvzKrc It has already been checked immediately before that said AVDictionaryEntry exists; checking again is redundant. Furthermore, av_hwdevice_find_type_by_name() requires its argument to be non-NULL, so adding a codepath that automatically calls it with that parameter is nonsense. The same goes for the argument corresponding to %s. Fixes Coverity issue 1491394. Signed-off-by: Andreas Rheinhardt --- If one wanted to sanitize something here, one should check for "if (e && e->value)" instead. Or unconditionally error out if (e && !e->value). libavutil/hwcontext_qsv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index 4ed50a31a0..268be9f8a1 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -1463,10 +1463,10 @@ static int qsv_device_create(AVHWDeviceContext *ctx, const char *device, e = av_dict_get(opts, "child_device_type", NULL, 0); if (e) { - child_device_type = av_hwdevice_find_type_by_name(e ? e->value : NULL); + child_device_type = av_hwdevice_find_type_by_name(e->value); if (child_device_type == AV_HWDEVICE_TYPE_NONE) { av_log(ctx, AV_LOG_ERROR, "Unknown child device type " - "\"%s\".\n", e ? e->value : NULL); + "\"%s\".\n", e->value); return AVERROR(EINVAL); } } else if (CONFIG_VAAPI) {