From a32e7f0eb23fa17f5af2fc4c8abfd79762934244 Mon Sep 17 00:00:00 2001
From: Divy Srivastava <dj.srivastava23@gmail.com>
Date: Wed, 7 Feb 2024 21:53:32 +0530
Subject: fix(node): handle brotli compression end chunk sizes (#22322)

Fixes https://github.com/denoland/deno/issues/22259
---
 ext/node/ops/zlib/brotli.rs   | 11 +++++------
 ext/node/polyfills/_brotli.js | 15 ++++++++++-----
 2 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'ext')

diff --git a/ext/node/ops/zlib/brotli.rs b/ext/node/ops/zlib/brotli.rs
index bc8aa9a25..f906e8827 100644
--- a/ext/node/ops/zlib/brotli.rs
+++ b/ext/node/ops/zlib/brotli.rs
@@ -167,7 +167,6 @@ pub fn op_brotli_compress_stream(
     let mut next_in = input.as_ptr();
     let mut available_out = output.len();
     let mut next_out = output.as_mut_ptr();
-    let mut total_out = 0;
 
     if BrotliEncoderCompressStream(
       ctx.inst,
@@ -176,7 +175,7 @@ pub fn op_brotli_compress_stream(
       &mut next_in,
       &mut available_out,
       &mut next_out,
-      &mut total_out,
+      std::ptr::null_mut(),
     ) != 1
     {
       return Err(type_error("Failed to compress"));
@@ -194,7 +193,7 @@ pub fn op_brotli_compress_stream_end(
   #[smi] rid: u32,
   #[buffer] output: &mut [u8],
 ) -> Result<usize, AnyError> {
-  let ctx = state.resource_table.take::<BrotliCompressCtx>(rid)?;
+  let ctx = state.resource_table.get::<BrotliCompressCtx>(rid)?;
 
   // SAFETY: TODO(littledivy)
   unsafe {
@@ -281,7 +280,6 @@ pub fn op_brotli_decompress_stream(
     let mut next_in = input.as_ptr();
     let mut available_out = output.len();
     let mut next_out = output.as_mut_ptr();
-    let mut total_out = 0;
 
     if matches!(
       CBrotliDecoderDecompressStream(
@@ -290,11 +288,12 @@ pub fn op_brotli_decompress_stream(
         &mut next_in,
         &mut available_out,
         &mut next_out,
-        &mut total_out,
+        std::ptr::null_mut(),
       ),
       BrotliDecoderResult::BROTLI_DECODER_RESULT_ERROR
     ) {
-      return Err(type_error("Failed to decompress"));
+      let ec = CBrotliDecoderGetErrorCode(ctx.inst) as i32;
+      return Err(type_error(format!("Failed to decompress, error {ec}")));
     }
 
     // On progress, next_out is advanced and available_out is reduced.
diff --git a/ext/node/polyfills/_brotli.js b/ext/node/polyfills/_brotli.js
index c815add22..b019836cf 100644
--- a/ext/node/polyfills/_brotli.js
+++ b/ext/node/polyfills/_brotli.js
@@ -51,7 +51,7 @@ export class BrotliDecompress extends Transform {
       // TODO(littledivy): use `encoding` argument
       transform(chunk, _encoding, callback) {
         const input = toU8(chunk);
-        const output = new Uint8Array(1024);
+        const output = new Uint8Array(chunk.byteLength);
         const avail = op_brotli_decompress_stream(context, input, output);
         this.push(output.slice(0, avail));
         callback();
@@ -76,14 +76,19 @@ export class BrotliCompress extends Transform {
       transform(chunk, _encoding, callback) {
         const input = toU8(chunk);
         const output = new Uint8Array(brotliMaxCompressedSize(input.length));
-        const avail = op_brotli_compress_stream(context, input, output);
-        this.push(output.slice(0, avail));
+        const written = op_brotli_compress_stream(context, input, output);
+        if (written > 0) {
+          this.push(output.slice(0, written));
+        }
         callback();
       },
       flush(callback) {
         const output = new Uint8Array(1024);
-        const avail = op_brotli_compress_stream_end(context, output);
-        this.push(output.slice(0, avail));
+        let avail;
+        while ((avail = op_brotli_compress_stream_end(context, output)) > 0) {
+          this.push(output.slice(0, avail));
+        }
+        core.close(context);
         callback();
       },
     });
-- 
cgit v1.2.3