fix(native): capture Mach-O header metadata alongside load commands (#525)
* fix(native): capture Mach-O header metadata alongside load commands Signed-off-by: Rudy Celekli <47457359+rudycelekli@users.noreply.github.com> * style(test): format native Mach-O header regression Signed-off-by: Rudy Celekli <47457359+rudycelekli@users.noreply.github.com> * fix(native): drop dead bare otool override in header test --------- Signed-off-by: Rudy Celekli <47457359+rudycelekli@users.noreply.github.com> Co-authored-by: morluto <76467478+morluto@users.noreply.github.com>
This commit is contained in:
co-authored by
morluto
parent
31ed005183
commit
a8195ba2cc
@@ -35,7 +35,7 @@ interface NativeMachoInspectionContext {
|
||||
const REQUIRED_COMMANDS = [
|
||||
["file", ["-b"]],
|
||||
["lipo", ["-detailed_info"]],
|
||||
["otool", ["-l"]],
|
||||
["otool", ["-h", "-l"]],
|
||||
["nm", ["-gjU"]],
|
||||
["dyld_info", ["-imports"]],
|
||||
["dyld_info", ["-exports"]],
|
||||
|
||||
@@ -98,7 +98,6 @@ const parseLoadCommand = (block: string, state: ParsedLoadCommands): void => {
|
||||
collectBuild(kind, block, fields, state);
|
||||
collectDependency(kind, fields, state);
|
||||
collectSegment(kind, block, fields, state);
|
||||
collectFlags(fields, state.flags);
|
||||
};
|
||||
|
||||
const collectUuid = (
|
||||
@@ -159,16 +158,6 @@ const collectSegment = (
|
||||
state.segments.push(parseSegment(block, fields));
|
||||
};
|
||||
|
||||
const collectFlags = (
|
||||
fields: Readonly<Record<string, string | number | null>>,
|
||||
flags: Set<string>,
|
||||
): void => {
|
||||
const rawFlags = stringField(fields, "flags");
|
||||
if (rawFlags === null) return;
|
||||
for (const flag of rawFlags.split(/\s+/u))
|
||||
if (flag.length > 0) flags.add(flag);
|
||||
};
|
||||
|
||||
const parseFields = (block: string): Record<string, string | number | null> => {
|
||||
const fields: Record<string, string | number | null> = {};
|
||||
for (const rawLine of block.split(/\r?\n/u).slice(1)) {
|
||||
|
||||
Reference in New Issue
Block a user