From e74e4e951bf59c42b25779b45d1c7b8dde6b618f Mon Sep 17 00:00:00 2001
From: Rudy Mizrahi Celekli <47457359+rudycelekli@users.noreply.github.com>
Date: Tue, 13 Oct 2026 02:50:44 -0400
Subject: [PATCH] fix(screenshot): reject invalid PNG header dimensions (#2472)

---
 src/domain/pngHeader.test.ts                  | 21 +++++++++++++
 src/domain/pngHeader.ts                       |  8 ++++-
 src/native/NativeUiObservation.test.ts        | 31 +++++++++++++++++++
 .../cdpScreenshotDocumentIdentity.test.ts     | 31 +++++++++++++++++++
 4 files changed, 90 insertions(+), 1 deletion(-)

diff --git a/src/domain/pngHeader.test.ts b/src/domain/pngHeader.test.ts
index e8df531bc..676a832e0 100644
--- a/src/domain/pngHeader.test.ts
+++ b/src/domain/pngHeader.test.ts
@@ -33,3 +33,24 @@ it("rejects incomplete headers, invalid signatures and zero dimensions", () => {
     expect(readPngHeaderDimensions(zero)).toBeUndefined();
   }
 });
+
+it.each([0, 12, 14, 0xffff_ffff])("rejects IHDR data length %s", (length) => {
+  const bytes = Buffer.from(png);
+  bytes.writeUInt32BE(length, 8);
+  expect(readPngHeaderDimensions(bytes)).toBeUndefined();
+});
+
+it.each([16, 20])("rejects out-of-range PNG dimension at %s", (offset) => {
+  const bytes = Buffer.from(png);
+  bytes.writeUInt32BE(0x8000_0000, offset);
+  expect(readPngHeaderDimensions(bytes)).toBeUndefined();
+});
+
+it("accepts the largest dimension representable by the PNG specification", () => {
+  const bytes = Buffer.from(png);
+  bytes.writeUInt32BE(0x7fff_ffff, 16);
+  expect(readPngHeaderDimensions(bytes)).toEqual({
+    width: 0x7fff_ffff,
+    height: 1,
+  });
+});
diff --git a/src/domain/pngHeader.ts b/src/domain/pngHeader.ts
index 58cdd7d3f..5ab8c7c3d 100644
--- a/src/domain/pngHeader.ts
+++ b/src/domain/pngHeader.ts
@@ -8,10 +8,16 @@ export const readPngHeaderDimensions = (
   if (
     bytes.byteLength < 24 ||
     !bytes.subarray(0, 8).equals(PNG_SIGNATURE) ||
+    bytes.readUInt32BE(8) !== 13 ||
     !bytes.subarray(12, 16).equals(IHDR_TYPE)
   )
     return undefined;
   const width = bytes.readUInt32BE(16);
   const height = bytes.readUInt32BE(20);
-  return width === 0 || height === 0 ? undefined : { width, height };
+  return width === 0 ||
+    height === 0 ||
+    width > 0x7fff_ffff ||
+    height > 0x7fff_ffff
+    ? undefined
+    : { width, height };
 };
diff --git a/src/native/NativeUiObservation.test.ts b/src/native/NativeUiObservation.test.ts
index d2238bd01..527afd8db 100644
--- a/src/native/NativeUiObservation.test.ts
+++ b/src/native/NativeUiObservation.test.ts
@@ -35,6 +35,37 @@ const validPng = Buffer.from(
   "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+jv4sAAAAASUVORK5CYII=",
   "base64",
 );
+it.each([
+  { offset: 8, value: 12 },
+  { offset: 16, value: 0x8000_0000 },
+  { offset: 20, value: 0x8000_0000 },
+])(
+  "rejects invalid IHDR metadata with a matching digest",
+  async ({ offset, value }) => {
+    const bytes = Buffer.from(validPng);
+    bytes.writeUInt32BE(value, offset);
+    const screenshot = {
+      mime_type: "image/png",
+      base64: bytes.toString("base64"),
+      sha256: createHash("sha256").update(bytes).digest("hex"),
+      width: bytes.readUInt32BE(16),
+      height: bytes.readUInt32BE(20),
+    };
+    const result = await observeNativeUi(
+      target,
+      "observe_native_ui",
+      { ...scope, screenshot: true },
+      {
+        environment: {},
+        invoke: async () => ({
+          ok: true,
+          result: { ...snapshot, screenshot },
+        }),
+      },
+    );
+    expect(result.ok).toBe(false);
+  },
+);
 describe("native UI screenshot validation", () => {
   it("rejects malformed or mismatched screenshot bytes from the helper", async () => {
     const screenshot = {
diff --git a/tests/boundary/browser/cdpScreenshotDocumentIdentity.test.ts b/tests/boundary/browser/cdpScreenshotDocumentIdentity.test.ts
index 012ad9663..b3fcbc592 100644
--- a/tests/boundary/browser/cdpScreenshotDocumentIdentity.test.ts
+++ b/tests/boundary/browser/cdpScreenshotDocumentIdentity.test.ts
@@ -3,6 +3,37 @@ import { CdpBrowserProvider } from "../../../src/browser/CdpBrowserProvider.js";
 import { captureWebScreenshotInputSchema } from "../../../src/domain/webScreenshot.js";
 import { startFakeCdpBrowser } from "../../fixtures/fakeCdpBrowser.js";
 describe("screenshot committed document identity", () => {
+  it.each([
+    { offset: 8, value: 14 },
+    { offset: 16, value: 0x8000_0000 },
+    { offset: 20, value: 0x8000_0000 },
+  ])("rejects invalid screenshot IHDR metadata", async ({ offset, value }) => {
+    const bytes = Buffer.from(
+      "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+jv4sAAAAASUVORK5CYII=",
+      "base64",
+    );
+    bytes.writeUInt32BE(value, offset);
+    const browser = await startFakeCdpBrowser({
+      commandResult: ({ method }) =>
+        method === "Page.captureScreenshot"
+          ? { data: bytes.toString("base64") }
+          : undefined,
+    });
+    onTestFinished(async () => {
+      await browser.close();
+    });
+    const result = await new CdpBrowserProvider().captureScreenshot(
+      captureWebScreenshotInputSchema.parse({
+        cdp_endpoint: browser.endpoint,
+        allowed_origins: [browser.allowedOrigin],
+        target_id: "allowed-page",
+      }),
+    );
+    expect(result).toMatchObject({
+      ok: false,
+      error: { reason: "protocol_error" },
+    });
+  });
   it.each(["loader-main", "loader-reloaded"])(
     "distinguishes %s for the same URL",
     async (screenshotDocumentLoader) => {