Reverse engineer anything with agents, from app behavior down to native binaries.
TypeScript agent-skillsai-agentsbinary-analysisclaude-codeclicodexcordisdecompilerdeveloper-toolsdshdsh-pluginghidrahopperllmmcpmodel-context-protocolreareverse-engineeringstatic-analysistouhou
fix(comparison): normalize CFG identity by numeric addresses (#593)
Rudy Mizrahi Celeklid1e5c0e1fd04
diff --git a/src/domain/functionComparison.test.ts b/src/domain/functionComparison.test.tsindex 100ae4df5..6b6f78a50 100644--- a/src/domain/functionComparison.test.ts+++ b/src/domain/functionComparison.test.ts@@ -102,6 +102,49 @@ const observe = (},);+describe("function comparison CFG address normalization", () => {+ it("matches CFG successors by numeric address", () => {+ const make = (base: "0x1000" | "0x2000") =>+ functionDossierSchema.parse({+ ...dossier("return 0;", base),+ basic_blocks: [+ {+ start: base,+ end: base === "0x1000" ? "0x1004" : "0x2004",+ successors: [base === "0x1000" ? "0X01004" : "0x2004"],+ },+ {+ start: base === "0x1000" ? "0x1004" : "0x2004",+ end: base === "0x1000" ? "0x1008" : "0x2008",+ successors: [],+ },+ ],+ });+ expect(+ compareFunctions(+ observe("b", make("0x1000")),+ observe("c", make("0x2000")),+ ).dimensions.find(({ dimension }) => dimension === "cfg"),+ ).toMatchObject({ status: "unchanged" });+ });++ it("keeps duplicate numeric block starts unknown", () => {+ const duplicate = functionDossierSchema.parse({+ ...dossier("return 0;", "0x1000"),+ basic_blocks: [+ { start: "0x1000", end: "0x1004", successors: [] },+ { start: "0X01000", end: "0x1008", successors: [] },+ ],+ });+ expect(+ compareFunctions(+ observe("d", duplicate),+ observe("e", duplicate),+ ).dimensions.find(({ dimension }) => dimension === "cfg"),+ ).toMatchObject({ status: "unknown" });+ });+});+describe("function comparison", () => {it("preserves text changes alongside complete inline dossier facets", () => {const result = compareFunctions(diff --git a/src/domain/functionComparisonNormalization.ts b/src/domain/functionComparisonNormalization.tsindex 00859234f..1d7dce3f8 100644--- a/src/domain/functionComparisonNormalization.ts+++ b/src/domain/functionComparisonNormalization.ts@@ -40,30 +40,36 @@ export const functionMatch = (export const normalizeCfg = (blocks: FunctionSnapshot["collections"]["basic_blocks"]["items"],): readonly unknown[] | null => {- const parsed = blocks.map((block) => ({- block,- start: parseAddress(block.start),- end: parseAddress(block.end),- }));- if (parsed.some(({ start, end }) => start === null || end === null))- return null;+ const parsed: {+ block: (typeof blocks)[number];+ start: bigint;+ end: bigint;+ }[] = [];+ for (const block of blocks) {+ const start = parseAddress(block.start);+ const end = parseAddress(block.end);+ if (start === null || end === null || end <= start) return null;+ parsed.push({ block, start, end });+ }const ordered = parsed.sort((left, right) =>- (left.start ?? 0n) < (right.start ?? 0n) ? -1 : 1,+ left.start < right.start ? -1 : left.start > right.start ? 1 : 0,);- if (new Set(ordered.map(({ block }) => block.start)).size !== ordered.length)+ if (new Set(ordered.map(({ start }) => start)).size !== ordered.length)return null;- if (ordered.some(({ start, end }) => (end ?? 0n) <= (start ?? 0n)))- return null;- const indices = new Map(- ordered.map(({ block }, index) => [block.start, index]),- );+ const indices = new Map(ordered.map(({ start }, index) => [start, index]));const graph = [];for (const { block, start, end } of ordered) {- const successors = block.successors.map((address) => indices.get(address));- if (successors.some((index) => index === undefined)) return null;+ const successors: number[] = [];+ for (const address of block.successors) {+ const parsedAddress = parseAddress(address);+ if (parsedAddress === null) return null;+ const index = indices.get(parsedAddress);+ if (index === undefined) return null;+ successors.push(index);+ }graph.push({- size: String((end ?? 0n) - (start ?? 0n)),- successors: successors.sort((left, right) => (left ?? 0) - (right ?? 0)),+ size: String(end - start),+ successors: successors.sort((left, right) => left - right),});}return graph;