Skip to content

Fetch: enhance Mach-O executable detection for modern Macs #23193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 11, 2025
Merged

Fetch: enhance Mach-O executable detection for modern Macs #23193

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/Package/Fetch.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1850,7 +1850,11 @@ const FileHeader = struct {
return magic_number == std.macho.MH_MAGIC or
magic_number == std.macho.MH_MAGIC_64 or
magic_number == std.macho.FAT_MAGIC or
magic_number == std.macho.FAT_MAGIC_64;
magic_number == std.macho.FAT_MAGIC_64 or
magic_number == std.macho.MH_CIGAM or
magic_number == std.macho.MH_CIGAM_64 or
magic_number == std.macho.FAT_CIGAM or
magic_number == std.macho.FAT_CIGAM_64;
}

pub fn isExecutable(self: *FileHeader) bool {
Expand All @@ -1875,6 +1879,11 @@ test FileHeader {
h.bytes_read = 0;
h.update(&macho64_magic_bytes);
try std.testing.expect(h.isExecutable());

const macho64_cigam_bytes = [_]u8{ 0xFE, 0xED, 0xFA, 0xCF };
h.bytes_read = 0;
h.update(&macho64_cigam_bytes);
try std.testing.expect(h.isExecutable());
}

// Result of the `unpackResource` operation. Enables collecting errors from
Expand Down