Fix the bspatch failure on an empty brotli stream

When we close the BrotliDecompressor, we check for
BrotliDecoderIsFinished(). This function may return false if we never
call BrotliDecoderDecompressStream(), leading to a failure in bspatch
in case of an empty brotli stream.

This CL fixes the issue by checking BrotliDecoderIsUsed() along with
IsFinished(). Since we have the compressed stream and the precomputed
uncompressed size in the patch; we need these checks to avoid unexpected
size mismatch.

Bug: 69472150
Test: unittest pass
Change-Id: Icf7b324836fa59fd3111ba91b03622215a0c8f5f

1 files changed, 6 insertions, 1 deletions

diff --git a/brotli_decompressor.cc b/brotli_decompressor.cc
index 683e391..f173a75 100644
--- a/brotli_decompressor.cc
+++ b/brotli_decompressor.cc
@@ -49,7 +49,12 @@ bool BrotliDecompressor::Read(uint8_t* output_data, size_t bytes_to_output) {
 }
 
 bool BrotliDecompressor::Close() {
-  if (!BrotliDecoderIsFinished(brotli_decoder_state_)) {
+  // In some cases, the brotli compressed stream could be empty. As a result,
+  // the function BrotliDecoderIsFinished() will return false because we never
+  // start the decompression. When that happens, we just destroy the decoder
+  // and return true.
+  if (BrotliDecoderIsUsed(brotli_decoder_state_) &&
+      !BrotliDecoderIsFinished(brotli_decoder_state_)) {
     LOG(ERROR) << "Unfinished brotli decoder." << endl;
     return false;
   }