3 files changed, 20 insertions, 2 deletions
diff --git a/ext/node/ops/zlib/brotli.rs b/ext/node/ops/zlib/brotli.rs
index f906e8827..dc3a40441 100644
--- a/ext/node/ops/zlib/brotli.rs
+++ b/ext/node/ops/zlib/brotli.rs
@@ -314,13 +314,15 @@ pub fn op_brotli_decompress_stream_end(
   unsafe {
     let mut available_out = output.len();
     let mut next_out = output.as_mut_ptr();
+    let mut available_in = 0;
+    let mut next_in = [];
     let mut total_out = 0;
 
     if matches!(
       CBrotliDecoderDecompressStream(
         ctx.inst,
-        &mut 0,
-        std::ptr::null_mut(),
+        &mut available_in,
+        next_in.as_mut_ptr(),
         &mut available_out,
         &mut next_out,
         &mut total_out,
diff --git a/ext/node/polyfills/_brotli.js b/ext/node/polyfills/_brotli.js
index b019836cf..8b1f53012 100644
--- a/ext/node/polyfills/_brotli.js
+++ b/ext/node/polyfills/_brotli.js
@@ -12,6 +12,7 @@ import {
   op_brotli_decompress,
   op_brotli_decompress_async,
   op_brotli_decompress_stream,
+  op_brotli_decompress_stream_end,
   op_create_brotli_compress,
   op_create_brotli_decompress,
 } from "ext:core/ops";
@@ -57,6 +58,11 @@ export class BrotliDecompress extends Transform {
         callback();
       },
       flush(callback) {
+        const output = new Uint8Array(1024);
+        let avail;
+        while ((avail = op_brotli_decompress_stream_end(context, output)) > 0) {
+          this.push(output.slice(0, avail));
+        }
         core.close(context);
         callback();
       },
diff --git a/tests/unit_node/zlib_test.ts b/tests/unit_node/zlib_test.ts
index 94b1c63ca..fa09bd687 100644
--- a/tests/unit_node/zlib_test.ts
+++ b/tests/unit_node/zlib_test.ts
@@ -171,3 +171,13 @@ Deno.test("brotli large chunk size", async () => {
   );
   assertEquals(output.length, input.length);
 });
+
+Deno.test("brotli decompress flush restore size", async () => {
+  const input = new Uint8Array(1000000);
+  const output = await buffer(
+    Readable.from([input])
+      .pipe(createBrotliCompress())
+      .pipe(createBrotliDecompress()),
+  );
+  assertEquals(output.length, input.length);
+});