fix(native): preserve universal Mach-O container identity
Keep FAT container format distinct from selected slice architecture through target admission, Evidence, snapshots, and CLI/MCP lifecycle results. Preserve native, Hopper, Ghidra, extraction, and dylib routing for the Mach-O family. Reject selected FAT ranges overlapping their table or too short for a Mach-O header. Replace empty-slice fixtures with in-bounds executable headers and cover thin, universal, single-slice, FAT64, and swapped containers. Validation: static and architecture checks, generated docs, targeted producer and public MCP tests. Provider routing uses controlled fixtures; no live Hopper, IDA, JADX, or Ghidra analysis was performed for this change.
This commit is contained in:
@@ -15,7 +15,12 @@ export type ExecutableMetadata =
|
||||
readonly mips: MipsElfMetadata;
|
||||
}
|
||||
| {
|
||||
readonly format: "mach-o" | "elf" | "dos-mz" | "dos-com";
|
||||
readonly format:
|
||||
| "mach-o"
|
||||
| "mach-o-universal"
|
||||
| "elf"
|
||||
| "dos-mz"
|
||||
| "dos-com";
|
||||
readonly architecture: Exclude<BinaryArchitecture, "mips">;
|
||||
readonly availableArchitectures: readonly Exclude<
|
||||
BinaryArchitecture,
|
||||
@@ -105,7 +110,10 @@ const parseFatMachO = (
|
||||
if (count === 0 || count > 128 || bytes.length < 8 + count * entrySize)
|
||||
return err("truncated or invalid FAT architecture table");
|
||||
const architectures: Exclude<BinaryArchitecture, "mips">[] = [];
|
||||
const sliceEnds = new Map<BinaryArchitecture, bigint>();
|
||||
const slices = new Map<
|
||||
Exclude<BinaryArchitecture, "mips">,
|
||||
{ readonly offset: bigint; readonly size: bigint }
|
||||
>();
|
||||
for (let index = 0; index < count; index += 1) {
|
||||
const entry = 8 + index * entrySize;
|
||||
const architecture = machArchitecture(read(entry));
|
||||
@@ -122,7 +130,7 @@ const parseFatMachO = (
|
||||
? bytes.readBigUInt64LE(entry + 16)
|
||||
: bytes.readBigUInt64BE(entry + 16)
|
||||
: BigInt(read(entry + 12));
|
||||
sliceEnds.set(architecture, offset + size);
|
||||
slices.set(architecture, { offset, size });
|
||||
}
|
||||
const preferred =
|
||||
host === "arm64"
|
||||
@@ -134,15 +142,23 @@ const parseFatMachO = (
|
||||
: host === "arm"
|
||||
? "arm"
|
||||
: undefined;
|
||||
if (preferred === undefined || !architectures.includes(preferred))
|
||||
const slice = preferred === undefined ? undefined : slices.get(preferred);
|
||||
if (preferred === undefined || slice === undefined)
|
||||
return err(`FAT binary has no host-compatible ${host} architecture`);
|
||||
const sliceEnd = sliceEnds.get(preferred) ?? 0n;
|
||||
const tableEnd = BigInt(8 + count * entrySize);
|
||||
if (slice.offset < tableEnd)
|
||||
return err(`FAT slice for ${preferred} overlaps the architecture table`);
|
||||
const minimumHeaderSize =
|
||||
preferred === "arm64" || preferred === "x86_64" ? 32n : 28n;
|
||||
if (slice.size < minimumHeaderSize)
|
||||
return err(`FAT slice for ${preferred} is shorter than its Mach-O header`);
|
||||
const sliceEnd = slice.offset + slice.size;
|
||||
if (sliceEnd > BigInt(fileSize))
|
||||
return err(
|
||||
`truncated FAT slice: the ${preferred} slice ends at byte ${sliceEnd}; the file has ${fileSize}`,
|
||||
);
|
||||
return ok({
|
||||
format: "mach-o",
|
||||
format: "mach-o-universal",
|
||||
architecture: preferred,
|
||||
availableArchitectures: architectures,
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user