From 828339feaad885d1570d38a006fb9e237851f589 Mon Sep 17 00:00:00 2001 From: Erica Marigold Date: Thu, 28 Nov 2024 17:48:57 +0000 Subject: [PATCH] fix(lib): fix exec detection fallthrough If the executable was invalid, and wasn't PE or ELF, it would fall through into the Mach-O case, which was a false positive. --- .../src/platform/detection/executable.luau | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/toolchainlib/src/platform/detection/executable.luau b/toolchainlib/src/platform/detection/executable.luau index f950745..0f41d99 100644 --- a/toolchainlib/src/platform/detection/executable.luau +++ b/toolchainlib/src/platform/detection/executable.luau @@ -77,16 +77,18 @@ return function(binaryContents: buffer): ExecutableDetectionResult? local is64bit = headerStart == MACHO_MAGIC_64 local is32bit = headerStart == MACHO_MAGIC_32 - return { - os = "macos", - --stylua: ignore - arch = ( - if is64bit and cpuType == MACHO_CPU_TYPES.x86 then "x86_64" - elseif is64bit and cpuType == MACHO_CPU_TYPES.arm then "aarch64" - elseif is32bit and cpuType == MACHO_CPU_TYPES.x86 then "x86" - elseif is32bit and cpuType == MACHO_CPU_TYPES.arm then "arm" - else nil - ), - } + if is64bit or is32bit then + return { + os = "macos", + arch = (if is64bit and cpuType == MACHO_CPU_TYPES.x86 + then "x86_64" + elseif is64bit and cpuType == MACHO_CPU_TYPES.arm then "aarch64" + elseif is32bit and cpuType == MACHO_CPU_TYPES.x86 then "x86" + elseif is32bit and cpuType == MACHO_CPU_TYPES.arm then "arm" + else nil), + } + end end + + return nil end