diff --git a/scripts/verify/baselines/raw-buffer-read.json b/scripts/verify/baselines/raw-buffer-read.json index cf63bc7df0..7cd180fdba 100644 --- a/scripts/verify/baselines/raw-buffer-read.json +++ b/scripts/verify/baselines/raw-buffer-read.json @@ -13,7 +13,6 @@ "src/domain/elfRelocation.ts": 6, "src/domain/inesContainer.ts": 5, "src/domain/managed/managedCliHeaderPrefix.ts": 5, - "src/domain/managed/managedMemberPointers.ts": 2, "src/domain/managed/managedMetadataHeaps.ts": 4, "src/domain/managed/managedMetadataInventoryRows.ts": 2, "src/domain/managed/managedMetadataLayout.ts": 7, diff --git a/src/domain/managed/managedMemberPointers.ts b/src/domain/managed/managedMemberPointers.ts index 36446fbe99..2417775b04 100644 --- a/src/domain/managed/managedMemberPointers.ts +++ b/src/domain/managed/managedMemberPointers.ts @@ -1,3 +1,4 @@ +import { BinaryReader } from "../binaryContainer.js"; import { managedDecodeBudget } from "./managedDecodeBudget.js"; import type { ManagedMetadataLayout, @@ -73,10 +74,12 @@ export const memberListRowLookup = ( const positions = new Uint32Array(definitionCount + 1); try { const width = layout.tableIndexSize(table); + // The pointer table's index width is a property of the layout, not of the row, so one + // reader covers the whole scan and each row keeps the width the table declares. + const reader = new BinaryReader(bytes, true, "managed-metadata-pointers"); for (let row = 1; row <= pointers.rowCount; row += 1) { const offset: number = pointers.offset + (row - 1) * pointers.rowSize; - const definition = - width === 2 ? bytes.readUInt16LE(offset) : bytes.readUInt32LE(offset); + const definition = width === 2 ? reader.u16(offset) : reader.u32(offset); if (definition === 0 || definition > definitionCount) throw managedFailure( "invalid-row",