mirrors/cmake
2
0 Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-10-04 04:03:22 +03:00
Code Activity

Merge topic 'file-READ_MACHO-crash'

Browse Source 
6d52fa636f file(READ_MACHO): Avoid crash on unknown archs in this undocumented command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12572
This commit is contained in:
Brad King authored and Kitware Robot committed 2026-09-29 08:15:15 -04:00
2 parents 01fe64bc80 6d52fa636f
commit 76ad67592d
1 file changed
+6 -3
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmMachO.cxx
+6 -3
View File
@@ -375,9 +375,12 @@ cmMachO::StringList cmMachO::GetArchitectures() const
char const* archName = "unknown";
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 130000
if (__builtin_available(macOS 13.0, *)) {
archName = (header.CpuType & CPU_TYPE_ARM)
? macho_arch_name_for_cpu_type(header.CpuType, header.CpuSubType)
: macho_arch_name_for_cpu_type(header.CpuType, CPU_SUBTYPE_MULTIPLE);
if (char const* archNameForCpuType = (header.CpuType & CPU_TYPE_ARM)
? macho_arch_name_for_cpu_type(header.CpuType, header.CpuSubType)
: macho_arch_name_for_cpu_type(header.CpuType,
CPU_SUBTYPE_MULTIPLE)) {
archName = archNameForCpuType;
}
} else
#endif
{