fix(native): parse renamed dyld_info re-exports (#2364)
* fix(native): parse renamed dyld_info re-exports dyld_info prints a re-export whose name differs from the source library's symbol as `[re-export] _foo_renamed (_foo from libfoo)`. The export parser only accepted `(from libfoo)`, so inspect_macho reported a nonexistent export named `_foo_renamed (_foo from libfoo)` with no source, and the nm row for `_foo_renamed` survived the name-based merge as a second export with reexport null. Accept the optional source symbol, trying the plain `(from lib)` form first so a library name containing ` from ` keeps its text. The row now reports `_foo_renamed` re-exported from libfoo and replaces the nm duplicate. The export schema has no field for the source symbol name, so exports coverage records a limitation when a renamed re-export is present. The golden fixture is a dyld_info capture of a synthetic dylib linked with -Wl,-alias,_foo,_foo_renamed. * fix(native): split dyld re-export suffix without nested quantifiers Replace the (?:(.+?)\s+)??from lazy-optional group with a linear string scan so malformed lines cannot backtrack and a library path containing " from " still keeps its whole text via the plain-form-first check. * test(native): cover nested re-export library names * fix(native): retain reexports missing from nm inventory --------- Co-authored-by: morluto <76467478+morluto@users.noreply.github.com> Co-authored-by: morluto <17176810+morluto@users.noreply.github.com>
This commit is contained in:
co-authored by
morluto
morluto
parent
f652709cac
commit
1d5f95dc4a
@@ -266,6 +266,11 @@ const normalizeMacho = (
|
||||
]),
|
||||
exports: covered(exports, false, [
|
||||
"Merged nm/dyld_info results may be incomplete for stripped binaries.",
|
||||
...(dyldExports.some(({ sourceSymbol }) => sourceSymbol !== undefined)
|
||||
? [
|
||||
"Renamed re-exports are listed under their exported name; the source library's symbol name is not reported.",
|
||||
]
|
||||
: []),
|
||||
]),
|
||||
segments: covered(
|
||||
load.segments.map((segment) => ({
|
||||
|
||||
@@ -4,6 +4,8 @@ interface ParsedDyldSymbol {
|
||||
readonly weak: boolean | null;
|
||||
readonly reexport: boolean | null;
|
||||
readonly source: string | null;
|
||||
/** The source library's name for a symbol it re-exports under another name. */
|
||||
readonly sourceSymbol?: string;
|
||||
}
|
||||
|
||||
/** Decode Apple dyld inventory rows, projecting export offsets to VM addresses. */
|
||||
@@ -33,15 +35,23 @@ export const parseDyldSymbols = (
|
||||
];
|
||||
return [];
|
||||
}
|
||||
const reexport = /^\[re-export\]\s+(.+?)(?:\s+\(from (.+)\))?$/u.exec(line);
|
||||
if (reexport?.[1] !== undefined)
|
||||
// dyld_info prints `_sym (from lib)`, or `_new (_old from lib)` when the
|
||||
// source library names the symbol differently. Split the trailing
|
||||
// parenthesized suffix with string scans so a library path containing
|
||||
// " from ", or a source symbol containing parentheses such as
|
||||
// `operator()`, cannot pull the match into nested lazy quantifiers.
|
||||
const reexport = parseReexportRow(line, knownExportNames);
|
||||
if (reexport !== null)
|
||||
return [
|
||||
{
|
||||
name: reexport[1],
|
||||
name: reexport.name,
|
||||
address: null,
|
||||
weak: null,
|
||||
reexport: true,
|
||||
source: reexport[2] ?? null,
|
||||
source: reexport.source,
|
||||
...(reexport.sourceSymbol === undefined
|
||||
? {}
|
||||
: { sourceSymbol: reexport.sourceSymbol }),
|
||||
},
|
||||
];
|
||||
const exported = /^(0x[\da-f]+)\s+(.+?)(?:\s+\[([^\]]+)\])?$/iu.exec(line);
|
||||
@@ -78,3 +88,70 @@ export const parseDyldSymbols = (
|
||||
|
||||
const canonicalHex = (value: string | undefined): string | null =>
|
||||
value === undefined ? null : `0x${BigInt(value).toString(16)}`;
|
||||
|
||||
interface ReexportRow {
|
||||
readonly name: string;
|
||||
readonly source: string | null;
|
||||
readonly sourceSymbol?: string;
|
||||
}
|
||||
|
||||
/**
|
||||
* Split a `[re-export]` row without nested lazy quantifiers.
|
||||
*
|
||||
* Returns null when the line is not a re-export row so callers fall through
|
||||
* to the plain export parser. Known names disambiguate nested parentheses;
|
||||
* when that inventory is incomplete, retain the suffix-based fallback.
|
||||
*/
|
||||
const parseReexportRow = (
|
||||
line: string,
|
||||
knownNames: ReadonlySet<string>,
|
||||
): ReexportRow | null => {
|
||||
const prefix = /^\[re-export\]\s+/u.exec(line);
|
||||
if (prefix === null) return null;
|
||||
const rest = line.slice(prefix[0].length);
|
||||
if (rest.length === 0) return null;
|
||||
if (!rest.endsWith(")")) return { name: rest, source: null };
|
||||
const candidates: ReexportRow[] = [];
|
||||
for (const match of rest.matchAll(/\s+\(/gu)) {
|
||||
const name = rest.slice(0, match.index);
|
||||
if (!knownNames.has(name)) continue;
|
||||
const parsed = reexportSuffix(
|
||||
name,
|
||||
rest.slice(match.index + match[0].length, -1),
|
||||
);
|
||||
if (parsed !== null) candidates.push(parsed);
|
||||
}
|
||||
// Exact nm identities establish a boundary even when names contain parentheses.
|
||||
// Competing known interpretations remain unknown rather than creating a new name.
|
||||
if (candidates.length > 0)
|
||||
return candidates.length === 1 ? candidates[0]! : null;
|
||||
if (knownNames.has(rest)) return { name: rest, source: null };
|
||||
let depth = 0;
|
||||
for (let index = rest.length - 1; index >= 0; index--) {
|
||||
if (rest[index] === ")") depth++;
|
||||
else if (rest[index] === "(" && --depth === 0) {
|
||||
if (index === 0 || !/\s/u.test(rest[index - 1]!)) break;
|
||||
const name = rest.slice(0, index).trimEnd();
|
||||
return (
|
||||
reexportSuffix(name, rest.slice(index + 1, -1)) ?? {
|
||||
name: rest,
|
||||
source: null,
|
||||
}
|
||||
);
|
||||
}
|
||||
}
|
||||
return { name: rest, source: null };
|
||||
};
|
||||
|
||||
const reexportSuffix = (name: string, inner: string): ReexportRow | null => {
|
||||
if (name.length === 0) return null;
|
||||
if (inner.startsWith("from ") && inner.length > 5)
|
||||
return { name, source: inner.slice(5) };
|
||||
const separator = /\s+from /u.exec(inner);
|
||||
if (separator === null) return null;
|
||||
const sourceSymbol = inner.slice(0, separator.index);
|
||||
const source = inner.slice(separator.index + separator[0].length);
|
||||
return sourceSymbol.length > 0 && source.length > 0
|
||||
? { name, source, sourceSymbol }
|
||||
: null;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user