fix(il2cpp): decode valid shared-suffix string offsets

Preserve bounds, termination and UTF-8 checks; verify CLI and stdio MCP preserve names and selected artifact identity.

Fixes #6808
This commit is contained in:
morluto
2026-10-24 00:27:56 +08:00
parent fc63fe8682
commit 4c5fae5179
4 changed files with 106 additions and 46 deletions
@@ -408,40 +408,44 @@ describe("rejected IL2CPP metadata references", () => {
);
});
it("rejects a shifted string section and names that start inside another string", () => {
// Pulled back, the fixture's strings would overlap the literal data.
for (const [delta, reason] of [
[-1, "section-overlap"],
[1, "invalid-string"],
] as const)
rejects(
mutated((fixture, bytes) => {
const strings = fixture.section("strings");
bytes.writeInt32LE(
strings.offset + delta,
fixture.header("strings", "offset"),
);
// Shrink a forward shift so it stays clear of the next section.
bytes.writeInt32LE(
strings.size - Math.max(delta, 0),
fixture.header("strings", "size"),
);
}),
reason,
);
it("rejects a string section overlapping literal data", () => {
rejects(
mutated((fixture, bytes) =>
mutated((fixture, bytes) => {
bytes.writeInt32LE(
fixture.stringOffset("Update") +
1 -
fixture.section("strings").offset,
fixture.record("methods", 0),
),
),
"invalid-string",
fixture.section("strings").offset - 1,
fixture.header("strings", "offset"),
);
}),
"section-overlap",
);
});
it("decodes a valid string suffix from its byte offset", () => {
const fixture = createIl2cppMetadataFixture({
typeNames: { 0: "xPlayer" },
});
const bytes = Buffer.from(fixture.bytes);
const originalOffset = fixture.record("typeDefinitions", 0);
bytes.writeInt32LE(bytes.readInt32LE(originalOffset) + 1, originalOffset);
expect(readIl2cppMetadata(bytes).types[0]?.name).toBe("Player");
});
it("accepts a UTF-8 code-point boundary suffix and rejects a split code point", () => {
const fixture = createIl2cppMetadataFixture({
typeNames: { 0: "xéclair" },
});
const nameOffset = fixture.record("typeDefinitions", 0);
const sourceOffset = fixture.bytes.readInt32LE(nameOffset);
const validSuffix = Buffer.from(fixture.bytes);
validSuffix.writeInt32LE(sourceOffset + 1, nameOffset);
expect(readIl2cppMetadata(validSuffix).types[0]?.name).toBe("éclair");
const splitCodePoint = Buffer.from(fixture.bytes);
splitCodePoint.writeInt32LE(sourceOffset + 2, nameOffset);
rejects(splitCodePoint, "invalid-string");
});
it("rejects nesting cycles and self-nesting", () => {
// Type 0 owns nestedTypes entry 0; listing itself there is a self-cycle.
rejects(
@@ -576,9 +580,7 @@ describe("IL2CPP global-metadata versions 29 and 31", () => {
mutated(
(target, bytes) =>
bytes.writeInt32LE(
target.stringOffset("Update") +
1 -
target.section("strings").offset,
target.section("strings").size + 1,
target.record("methods", 0),
),
fixture,