From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 511E942E0C for ; Sat, 9 Jul 2022 03:57:45 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E8ACB68B9B5; Sat, 9 Jul 2022 06:57:42 +0300 (EEST) 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-Google-Smtp-Source: AGRyM1vgPYZoJk1bAeRDFMJ3SDJl/UsZZOZBd6iIYreceLodXqr8Y0ROgaWWIiUVALzjBPUlqVdWHJf3ddh0MQ== 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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; } } -- 2.37.0.rc0.161.g10f37bed90-goog _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".