fix(dotnet): name the instruction when a CIL operand leaves the method body (#2697)
The decoder already reports "Instruction X at IL offset N leaves method
body" when an operand's computed end passes the IL body, but only after
the operand was read. Operand readers use Buffer reads, so an operand
cut off by the body end threw a RangeError first. The catch-all stored
Node's message ("Attempt to access memory outside buffer bounds" or an
offset RangeError) as body.issue, dropping the instruction and offset.
A body ending in a lone 0xFE two-byte opcode prefix failed the same way.
Treat a RangeError from the operand read as the operand leaving the body
so the existing diagnostic applies, and check the second opcode byte
before reading it. Malformed status, partial coverage and earlier
decoded instructions are unchanged.
Fixes #2677
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5.5
parent
cdc41fc86c
commit
97dc6581f4
@@ -510,3 +510,41 @@ describe("managed exception section decoding", () => {
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe("managed CIL truncated operands", () => {
|
||||
const tinyBody = (il: readonly number[]) => {
|
||||
const bytes = buildManagedPeFixture({
|
||||
ilBody: Buffer.from([(il.length << 2) | 0x02, ...il]),
|
||||
});
|
||||
const inspection = inspectManagedMembersBytes(
|
||||
bytes,
|
||||
managedPeFixtureTarget(bytes),
|
||||
);
|
||||
return { body: inspection.methods[0]?.body, coverage: inspection.coverage };
|
||||
};
|
||||
|
||||
it.each([
|
||||
[[0x20], 0, "Instruction ldc.i4 at IL offset 0 leaves method body"],
|
||||
[
|
||||
[0x00, 0x20, 0x01],
|
||||
1,
|
||||
"Instruction ldc.i4 at IL offset 1 leaves method body",
|
||||
],
|
||||
[[0x2b], 0, "Instruction br.s at IL offset 0 leaves method body"],
|
||||
[[0x45, 0x02], 0, "Instruction switch at IL offset 0 leaves method body"],
|
||||
[
|
||||
[0xfe, 0x09, 0x00],
|
||||
0,
|
||||
"Instruction ldarg at IL offset 0 leaves method body",
|
||||
],
|
||||
[[0x00, 0xfe], 1, "Two-byte CIL opcode at IL offset 1 leaves method body"],
|
||||
])("names the instruction and IL offset for IL %j", (il, decoded, issue) => {
|
||||
const { body, coverage } = tinyBody(il);
|
||||
expect(body).toMatchObject({
|
||||
status: "malformed",
|
||||
decoded_instruction_count: decoded,
|
||||
issue,
|
||||
});
|
||||
expect(coverage.state).toBe("partial");
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user