pesde-pkg/tooling
1
1
Fork 0
mirror of https://github.com/pesde-pkg/tooling.git synced 2025-04-04 19:00:57 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix(lib): fix exec detection fallthrough

Browse source 
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.
This commit is contained in:
Erica Marigold 2024-11-28 17:48:57 +00:00
parent 40e8cfe71a
commit 828339feaa
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
toolchainlib/src/platform/detection/executable.luau
View file

@ -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