From patchwork Sat Jul 9 03:57:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Mazzarella X-Patchwork-Id: 36717 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:6da0:b0:8b:e47:9dbf with SMTP id wl32csp2461pzb; Fri, 8 Jul 2022 20:57:48 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tx97eRrPhSEFHINEXLTYBKuxftUsEeiQY2JtseFuWYp09tdF9zTfg7SjlrzO6Ht8xuxnxD X-Received: by 2002:a05:6402:84a:b0:423:fe99:8c53 with SMTP id b10-20020a056402084a00b00423fe998c53mr9159080edz.195.1657339068457; Fri, 08 Jul 2022 20:57:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657339068; cv=none; d=google.com; s=arc-20160816; b=n8Vpmx03jS/rAUIRLnb4tEiBgXgoAC2f42uMG4sP09z4jFiinjlA8CFMydK/tmtTrS WDNL7EETkXigzDZ6AeiRgLE9SSgpNqMkxk2oD+KOC7gZFx9KkhxHRUZHCmef8qFaRqKv y3tIg4JRlbSRxDJRBzsoBa462zSzgrLhFXvWB03oURxlpfY6Z1hO0p9rYCv/UsZXwiwZ MdT31FJvlcXhzsOo9Bq2sdlHUOoZO5UIhqdxyk3WbSaCarEzJ/c0iJ0hU0jj8qz8DsYS edrDFMIQ48LkvuhuQTcxpbZwGNaS6Rg5sYxyF+ifZE60Blqh8xvY6E2hHnB0E8f6gmxx E1rQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:from:mime-version:message-id:date :dkim-signature:delivered-to; bh=CTKo3DNW3lfDFffgYbJoASDsFzZydLt7jmrsi005DBc=; b=SmJUYDZeWCNyhZyTID4QjohP0zv1+yc/LCqxufZqsktaz0/QzkZsmVjtRkaOMQTCsd +fRMbJAmLRPRHCR7fOjGcZKMINivVxlqA8Uj9oa83fszf7fe4XEeNrN6yofXN8Da9F2a tnVOAJXT97CkAaUsGJT4czR3qrc7lADRPPe4YtQr7pPJZuCcJEonWawbnrWcvNWJM+0g pCqyxuG/fcrT8tAuyK0Tv3oJyloxSz3kjVaE37tai8k49lqv4JMeI7l2gQxf+0DxxD4Z Sbg9yfYXIViPnK+XR8DxDTUarUWia9FlVBlx4waLLnbCFMlLSoeCNUFysr8oXgaq+WEf ejkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20210112 header.b=pIdl0dUP; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qu23-20020a170907111700b007152a3ee4fesi466110ejb.834.2022.07.08.20.57.47; Fri, 08 Jul 2022 20:57:48 -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=@google.com header.s=20210112 header.b=pIdl0dUP; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2668268B9BD; Sat, 9 Jul 2022 06:57:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AB4C868B85D for ; Sat, 9 Jul 2022 06:57:36 +0300 (EEST) Received: by mail-pj1-f74.google.com with SMTP id pt7-20020a17090b3d0700b001efb2800e55so359607pjb.3 for ; Fri, 08 Jul 2022 20:57:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=W3abOH0GOz/M3DuWlOA3iYFIfFK8DqNlP0yum+gK6U8=; b=pIdl0dUPnmGGf7rMdCk5hZlNrOfE3teEk0kOpPOsOQvSj+vj54JBCJqH7+ot7W4PDt mz2mVXz+LGa8KckEcTISO+udEDM3nHeddWysM+Hzrm4nLNjGI5a8/ofSnj/chlgZ7aha IO1H7lSXzFTOsINejplKo7SK5RHaHVMpVKWfGLYTVzPaa40sXSLZFjX10pHMF4Ojy85o drhLshkTRfG6wM0o4u0M/yY3KHMFHIvBI4YIPn4XKbXhnqzSE6w+yDiOkS0dIPk96ziI vPkT1OxjSLhQcjYBc5XypH0bpE0KjPo1wE1GVNSjxBJMhE4dRm3kVzsTY1dC8tZdenhU Wajg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=W3abOH0GOz/M3DuWlOA3iYFIfFK8DqNlP0yum+gK6U8=; b=CM9TbdehgYqkUNjT6C1gRH+am0/YaK9lpXTHwgRnFsoN3EB1SZOd4NMeuGPbKB3lM1 G8yGR7R6u4hhR1dan7gwBKiPkLLG8JF4lTyIqB7DZYtMY/+LiHyglERlAXI4Rt3KjDkE SMiWdIybA4YOR8+QkxCLNekHZHtA6vKsZT8J8OXnYKjwfowsPQp4e/3DlNNIqD6Bhxk0 4uyFemPa2DXXAiD3Y6SoncIlhz9lKVyW3kfPyL6EAAb909846EYL21HC2B1Tjrk+Vk7Y kpuectfTf4NrZUTz8DDygsMCB9tuyfM3EUzfqC2SwKetCc19E5P7L+SQUqPOf9lpV7rv 0BKA== X-Gm-Message-State: AJIora/wFmejTkak+3ndAAHt6nZVJemHWTkRsnBlRMSt58ED9MWNjff/ CqbimmJj6ygzw/HcD6JJbPxl+2SsUbUMT1PKkNtb09ypQ7izLlgQ1p/c/5QyLAzkMcJuucQSxZV 9tCoACGlTkAsw8lemt/2owZTCzKd1lC7hBNdxjvyWckBYAKsT/aS4AcDfMJsp27+ixAzL X-Received: from amirmazz.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:dca]) (user=amirmazz job=sendgmr) by 2002:aa7:9519:0:b0:528:c2e0:b7ae with SMTP id b25-20020aa79519000000b00528c2e0b7aemr6973506pfp.39.1657339053806; Fri, 08 Jul 2022 20:57:33 -0700 (PDT) Date: Sat, 9 Jul 2022 03:57:23 +0000 Message-Id: <20220709035723.2035064-1-amirmazz@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.37.0.rc0.161.g10f37bed90-goog From: Amir Mazzarella To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] Remove unsafe bitwise OR on FFVulkanExtensions enum 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: Amir Mazzarella Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: be75C/9EnRav FFVulkanExtensions enum does not have a value for 0 defined, and bitwise OR on enums is not safe. The function returns uint64_t, so it makes more sense and is safer to do arithmetic in terms of uint64_t Signed-off-by: Amir Mazzarella --- libavutil/vulkan_loader.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/vulkan_loader.h b/libavutil/vulkan_loader.h index 3f1ee6aa46..0b2de4ab94 100644 --- a/libavutil/vulkan_loader.h +++ b/libavutil/vulkan_loader.h @@ -50,12 +50,12 @@ static inline uint64_t ff_vk_extensions_to_mask(const char * const *extensions, #endif }; - FFVulkanExtensions mask = 0x0; + uint64_t mask = 0x0; for (int i = 0; i < nb_extensions; i++) { for (int j = 0; j < FF_ARRAY_ELEMS(extension_map); j++) { if (!strcmp(extensions[i], extension_map[j].name)) { - mask |= extension_map[j].flag; + mask |= (uint64_t) extension_map[j].flag; continue; } }