fix: handle malformed control buffers (#3202)

2 files changed, 61 insertions, 1 deletions

diff --git a/cli/js/dispatch_json_test.ts b/cli/js/dispatch_json_test.ts
index 11dadc620..07549d295 100644
--- a/cli/js/dispatch_json_test.ts
+++ b/cli/js/dispatch_json_test.ts
@@ -1,4 +1,11 @@
-import { testPerm, assertMatch, unreachable } from "./test_util.ts";
+import {
+  test,
+  testPerm,
+  assert,
+  assertEquals,
+  assertMatch,
+  unreachable
+} from "./test_util.ts";
 
 const openErrorStackPattern = new RegExp(
   `^.*
@@ -17,3 +24,14 @@ testPerm({ read: true }, async function sendAsyncStackTrace(): Promise<void> {
       }
     );
 });
+
+test(async function malformedJsonControlBuffer(): Promise<void> {
+  // @ts-ignore
+  const res = Deno.core.send(10, new Uint8Array([1, 2, 3, 4, 5]));
+  const resText = new TextDecoder().decode(res);
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const resJson = JSON.parse(resText) as any;
+  assert(!resJson.ok);
+  assert(resJson.err);
+  assertEquals(resJson.err!.kind, Deno.ErrorKind.InvalidInput);
+});
diff --git a/cli/js/dispatch_minimal_test.ts b/cli/js/dispatch_minimal_test.ts
new file mode 100644
index 000000000..a08252171
--- /dev/null
+++ b/cli/js/dispatch_minimal_test.ts
@@ -0,0 +1,42 @@
+import {
+  test,
+  assert,
+  assertEquals,
+  assertMatch,
+  unreachable
+} from "./test_util.ts";
+
+const readErrorStackPattern = new RegExp(
+  `^.*
+    at unwrapResponse \\(.*dispatch_minimal\\.ts:.*\\)
+    at Object.sendAsync \\(.*dispatch_minimal\\.ts:.*\\)
+    at async Object\\.open \\(.*files\\.ts:.*\\).*$`,
+  "ms"
+);
+
+test(async function sendAsyncStackTrace(): Promise<void> {
+  const buf = new Uint8Array(10);
+  await Deno.read(10, "nonexistent.txt", buf)
+    .then(unreachable)
+    .catch(
+      (error): void => {
+        assertMatch(error.stack, readErrorStackPattern);
+      }
+    );
+});
+test(async function malformedMinimalControlBuffer(): Promise<void> {
+  // @ts-ignore
+  const res = Deno.core.send(1, new Uint8Array([1, 2, 3, 4, 5]));
+  const header = res.slice(0, 12);
+  const buf32 = new Int32Array(
+    header.buffer,
+    header.byteOffset,
+    header.byteLength / 4
+  );
+  const arg = buf32[1];
+  const result = buf32[2];
+  const message = new TextDecoder().decode(res.slice(12));
+  assert(arg < 0);
+  assertEquals(result, Deno.ErrorKind.InvalidInput);
+  assertEquals(message, "Unparsable control buffer");
+});