diff --git a/scripts/verify/baselines/raw-buffer-read.json b/scripts/verify/baselines/raw-buffer-read.json index 7cd180fdba..b7d1b4623f 100644 --- a/scripts/verify/baselines/raw-buffer-read.json +++ b/scripts/verify/baselines/raw-buffer-read.json @@ -12,11 +12,9 @@ "src/domain/desktop/openPgpKeys.ts": 2, "src/domain/elfRelocation.ts": 6, "src/domain/inesContainer.ts": 5, - "src/domain/managed/managedCliHeaderPrefix.ts": 5, "src/domain/managed/managedMetadataHeaps.ts": 4, "src/domain/managed/managedMetadataInventoryRows.ts": 2, "src/domain/managed/managedMetadataLayout.ts": 7, - "src/domain/managed/managedPeReader.ts": 5, "src/domain/native/elfNoteLayout.ts": 3, "src/domain/native/elfPointerRelocations.ts": 6, "src/domain/native/nativeAotPe.ts": 26, diff --git a/src/domain/managed/managedCliHeaderPrefix.ts b/src/domain/managed/managedCliHeaderPrefix.ts index fd9afbe480..05112e7ab5 100644 --- a/src/domain/managed/managedCliHeaderPrefix.ts +++ b/src/domain/managed/managedCliHeaderPrefix.ts @@ -1,3 +1,4 @@ +import { BinaryReader } from "../binaryContainer.js"; import { err, ok } from "../result.js"; /** IMAGE_COR20_HEADER's first 16 bytes; consumers own directory/range admission. */ @@ -7,13 +8,14 @@ export const readManagedCliHeaderPrefix = (bytes: Buffer) => { kind: "malformed" as const, message: "CLI runtime header prefix is truncated", }); + const reader = new BinaryReader(bytes, true, "managed-pe"); return ok({ - headerSize: bytes.readUInt32LE(0), - runtimeMajor: bytes.readUInt16LE(4), - runtimeMinor: bytes.readUInt16LE(6), + headerSize: reader.u32(0), + runtimeMajor: reader.u16(4), + runtimeMinor: reader.u16(6), metadata: { - rva: bytes.readUInt32LE(8), - size: bytes.readUInt32LE(12), + rva: reader.u32(8), + size: reader.u32(12), }, }); }; diff --git a/src/domain/managed/managedPeReader.ts b/src/domain/managed/managedPeReader.ts index d0f9c65245..5b76176e78 100644 --- a/src/domain/managed/managedPeReader.ts +++ b/src/domain/managed/managedPeReader.ts @@ -1,3 +1,4 @@ +import { BinaryReader } from "../binaryContainer.js"; import { observeMzWindowsHeader } from "../dosMz.js"; import { PE_SIZE_OF_HEADERS_OFFSET, @@ -228,11 +229,14 @@ const resolveRva = ( const mapRva = (mapping: RvaMapping): number => mapping.rva === 0 && mapping.size === 0 ? 0 : resolveRva(mapping).offset; -const readDirectory = (bytes: Buffer, offset: number): PeDataDirectory => { - requireRange(bytes, offset, 8, "pe.data-directory"); +const readDirectory = ( + reader: BinaryReader, + offset: number, +): PeDataDirectory => { + requireRange(reader.bytes, offset, 8, "pe.data-directory"); return { - rva: bytes.readUInt32LE(offset), - size: bytes.readUInt32LE(offset + 4), + rva: reader.u32(offset), + size: reader.u32(offset + 4), }; }; @@ -288,8 +292,9 @@ const readCliHeader = ( "CLI metadata directory is absent", offset + 8, ); - const flags = bytes.readUInt32LE(offset + 16); - const managedNativeHeader = readDirectory(bytes, offset + 64); + const reader = new BinaryReader(bytes, true, "managed-pe"); + const flags = reader.u32(offset + 16); + const managedNativeHeader = readDirectory(reader, offset + 64); let readyToRunSignature = false; if (managedNativeHeader.rva !== 0 && managedNativeHeader.size >= 4) { const nativeOffset = mapRva({ @@ -299,7 +304,7 @@ const readCliHeader = ( size: 4, scope: "cli.managed-native-header", }); - readyToRunSignature = bytes.readUInt32LE(nativeOffset) === 0x0052_5452; + readyToRunSignature = reader.u32(nativeOffset) === 0x0052_5452; } return { headerOffset: offset, @@ -308,9 +313,9 @@ const readCliHeader = ( runtimeMinor, metadata, flags, - entryPoint: bytes.readUInt32LE(offset + 20), - resources: readDirectory(bytes, offset + 24), - strongName: readDirectory(bytes, offset + 32), + entryPoint: reader.u32(offset + 20), + resources: readDirectory(reader, offset + 24), + strongName: readDirectory(reader, offset + 32), managedNativeHeader, readyToRunSignature, };