From b239ea80111bff71247efdec159362e961d4e306 Mon Sep 17 00:00:00 2001 From: morluto <76467478+morluto@users.noreply.github.com> Date: Thu, 19 Nov 2026 16:17:34 -0500 Subject: [PATCH] refactor(elf): share bounded note header reads (#12527) --- scripts/verify/baselines/raw-buffer-read.json | 1 - src/domain/native/elfNoteLayout.test.ts | 7 ++++++- src/domain/native/elfNoteLayout.ts | 12 ++++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/scripts/verify/baselines/raw-buffer-read.json b/scripts/verify/baselines/raw-buffer-read.json index e522e63514..dc5a58d47c 100644 --- a/scripts/verify/baselines/raw-buffer-read.json +++ b/scripts/verify/baselines/raw-buffer-read.json @@ -14,7 +14,6 @@ "src/domain/managed/managedMetadataHeaps.ts": 4, "src/domain/managed/managedMetadataInventoryRows.ts": 2, "src/domain/managed/managedMetadataLayout.ts": 7, - "src/domain/native/elfNoteLayout.ts": 3, "src/domain/native/elfPointerRelocations.ts": 6, "src/domain/native/nativeAotPe.ts": 26, "src/domain/native/readBinaryContainer.ts": 1, diff --git a/src/domain/native/elfNoteLayout.test.ts b/src/domain/native/elfNoteLayout.test.ts index 76738235d4..e510c7afae 100644 --- a/src/domain/native/elfNoteLayout.test.ts +++ b/src/domain/native/elfNoteLayout.test.ts @@ -11,7 +11,12 @@ it.each([false, true])( view.setUint32(4, 0x80000001, littleEndian); view.setUint32(8, 0xfedcba98, littleEndian); const before = Buffer.from(backing); - const parsed = readElfNoteHeader(backing.subarray(7), littleEndian); + const prefix = new Uint8Array( + backing.buffer, + backing.byteOffset + 7, + backing.byteLength - 7, + ); + const parsed = readElfNoteHeader(prefix, littleEndian); expect(backing.equals(before)).toBe(true); backing.fill(0); expect(parsed).toEqual({ diff --git a/src/domain/native/elfNoteLayout.ts b/src/domain/native/elfNoteLayout.ts index 6e64ba166f..06d4aca2b5 100644 --- a/src/domain/native/elfNoteLayout.ts +++ b/src/domain/native/elfNoteLayout.ts @@ -1,3 +1,4 @@ +import { BinaryReader } from "../binaryContainer.js"; import { err, ok } from "../result.js"; export const ELF_NOTE_HEADER_BYTES = 12; @@ -26,11 +27,14 @@ export const readElfNoteHeader = (bytes: Uint8Array, littleEndian: boolean) => { kind: "malformed" as const, message: "ELF note header is truncated", }); - const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength); + const prefix = Buffer.isBuffer(bytes) + ? bytes + : Buffer.from(bytes.buffer, bytes.byteOffset, bytes.byteLength); + const reader = new BinaryReader(prefix, littleEndian, "ELF note"); return ok({ - namesz: view.getUint32(0, littleEndian), - descsz: view.getUint32(4, littleEndian), - type: view.getUint32(8, littleEndian), + namesz: reader.u32(0), + descsz: reader.u32(4), + type: reader.u32(8), }); };