From fe8d0bdd36fe12bc0836468d1a702a34fbdc219b Mon Sep 17 00:00:00 2001
From: morluto <76467478+morluto@users.noreply.github.com>
Date: Tue, 13 Oct 2026 14:56:04 +0800
Subject: [PATCH] fix(android): reject malformed UTF-8 at the JADX protocol
 boundary

---
 src/android/JadxMcpTransport.ts               |  8 +-
 .../boundary/android/jadxMcpTransport.test.ts | 94 +++++++++++--------
 2 files changed, 61 insertions(+), 41 deletions(-)

diff --git a/src/android/JadxMcpTransport.ts b/src/android/JadxMcpTransport.ts
index c648696fc..a40d517f5 100644
--- a/src/android/JadxMcpTransport.ts
+++ b/src/android/JadxMcpTransport.ts
@@ -199,9 +199,11 @@ export class JadxMcpTransport implements Transport {
           throw new Error(`JADX MCP frame exceeds ${MAX_FRAME_BYTES} bytes`);
         this.#appendFrame(fragment, frameBytes);
         if (newline === -1) return;
-        const line = this.#frameBuffer
-          .subarray(0, this.#frameLength)
-          .toString("utf8");
+        const line = new TextDecoder("utf-8", {
+          fatal: true,
+          // Preserve a leading BOM so the JSON-RPC parser can reject it.
+          ignoreBOM: true,
+        }).decode(this.#frameBuffer.subarray(0, this.#frameLength));
         this.#frameBuffer = Buffer.alloc(0);
         this.#frameLength = 0;
         this.onmessage?.(deserializeMessage(line));
diff --git a/tests/boundary/android/jadxMcpTransport.test.ts b/tests/boundary/android/jadxMcpTransport.test.ts
index afe79fc09..fe05f14b4 100644
--- a/tests/boundary/android/jadxMcpTransport.test.ts
+++ b/tests/boundary/android/jadxMcpTransport.test.ts
@@ -26,6 +26,26 @@ class FixtureProcess extends EventEmitter implements ProviderProcessHandle {
   }
 }
 
+const fixtureLauncher =
+  (process: FixtureProcess): JadxLauncher =>
+  async ({ runId }) => ({
+    process,
+    ownership: {
+      runId,
+      leaderPid: process.pid,
+      processGroupId: process.pid,
+      expectedParentPid: process.pid,
+    },
+    cleanup: async () => {
+      process.emit("exit", 0, null);
+      process.emit("close", 0, null);
+      process.stdout.end();
+      process.stderr.end();
+      process.stdin.end();
+      return { cleaned: true, signaled: false };
+    },
+  });
+
 it("joins pending input errors before detaching the owned protocol stream", async () => {
   let completeWrite: ((cause: Error) => void) | undefined;
   const failure = new Error("owned pipe closed during cancellation");
@@ -70,26 +90,9 @@ it("joins pending input errors before detaching the owned protocol stream", asyn
 
 it("decodes split UTF-8 and newline bytes, then routes multiple complete frames", async () => {
   const process = new FixtureProcess();
-  const launcher: JadxLauncher = async ({ runId }) => ({
-    process,
-    ownership: {
-      runId,
-      leaderPid: process.pid,
-      processGroupId: process.pid,
-      expectedParentPid: process.pid,
-    },
-    cleanup: async () => {
-      process.emit("exit", 0, null);
-      process.emit("close", 0, null);
-      process.stdout.end();
-      process.stderr.end();
-      process.stdin.end();
-      return { cleaned: true, signaled: false };
-    },
-  });
   const transport = new JadxMcpTransport(
     { command: "fixture", arguments: [] },
-    launcher,
+    fixtureLauncher(process),
   );
   const received: JSONRPCMessage[] = [];
   transport.onmessage = (message) => received.push(message);
@@ -98,7 +101,9 @@ it("decodes split UTF-8 and newline bytes, then routes multiple complete frames"
   const first = {
     jsonrpc: "2.0",
     id: 1,
-    result: { content: [{ type: "text", text: "snow 雪 🦊" }] },
+    result: {
+      content: [{ type: "text", text: "snow 雪 🦊 and literal �" }],
+    },
   } satisfies JSONRPCMessage;
   const second = {
     jsonrpc: "2.0",
@@ -120,28 +125,41 @@ it("decodes split UTF-8 and newline bytes, then routes multiple complete frames"
   await transport.close();
 });
 
-it("accepts a complete JSON-RPC frame at the 8 MiB boundary", async () => {
+it.each([
+  ["invalid UTF-8 byte", Buffer.from([0xff])],
+  ["truncated UTF-8 sequence", Buffer.from([0xe2, 0x82])],
+])("rejects %s in a complete JSON-RPC frame", async (_label, invalid) => {
   const process = new FixtureProcess();
-  const launcher: JadxLauncher = async ({ runId }) => ({
-    process,
-    ownership: {
-      runId,
-      leaderPid: process.pid,
-      processGroupId: process.pid,
-      expectedParentPid: process.pid,
-    },
-    cleanup: async () => {
-      process.emit("exit", 0, null);
-      process.emit("close", 0, null);
-      process.stdout.end();
-      process.stderr.end();
-      process.stdin.end();
-      return { cleaned: true, signaled: false };
-    },
-  });
   const transport = new JadxMcpTransport(
     { command: "fixture", arguments: [] },
-    launcher,
+    fixtureLauncher(process),
+  );
+  const received: JSONRPCMessage[] = [];
+  const errors: Error[] = [];
+  transport.onmessage = (message) => received.push(message);
+  transport.onerror = (cause) => errors.push(cause);
+
+  await transport.start();
+  process.stdout.write(
+    Buffer.concat([
+      Buffer.from('{"jsonrpc":"2.0","id":1,"result":{"text":"'),
+      invalid,
+      Buffer.from('"}}\n'),
+    ]),
+  );
+  await new Promise<void>((resolve) => setImmediate(resolve));
+  await transport.close();
+
+  expect(received).toEqual([]);
+  expect(errors).toHaveLength(1);
+  expect(errors[0]?.message).toMatch(/encoded data was not valid/i);
+});
+
+it("accepts a complete JSON-RPC frame at the 8 MiB boundary", async () => {
+  const process = new FixtureProcess();
+  const transport = new JadxMcpTransport(
+    { command: "fixture", arguments: [] },
+    fixtureLauncher(process),
   );
   const received: JSONRPCMessage[] = [];
   transport.onmessage = (message) => received.push(message);