brotli 0.8.0 → 0.9.1

data/vendor/brotli/c/dec/decode.c

@@ -1176,7 +1176,7 @@ static BrotliDecoderErrorCode DecodeContextMap(brotli_reg_t context_map_size,
 
 /* Decodes a command or literal and updates block type ring-buffer.
    Reads 3..54 bits. */
-static BROTLI_INLINE BROTLI_BOOL DecodeBlockTypeAndLength(
+static BROTLI_INLINE BrotliDecoderErrorCode DecodeBlockTypeAndLength(
     int safe, BrotliDecoderState* s, int tree_type) {
   brotli_reg_t max_block_type = s->num_block_types[tree_type];
   const HuffmanCode* type_tree = &s->block_type_trees[
@@ -1187,7 +1187,7 @@ static BROTLI_INLINE BROTLI_BOOL DecodeBlockTypeAndLength(
   brotli_reg_t* ringbuffer = &s->block_type_rb[tree_type * 2];
   brotli_reg_t block_type;
   if (max_block_type <= 1) {
-    return BROTLI_FALSE;
+    return BROTLI_DECODER_ERROR_FORMAT_BLOCK_SWITCH;
   }
 
   /* Read 0..15 + 3..39 bits. */
@@ -1197,11 +1197,13 @@ static BROTLI_INLINE BROTLI_BOOL DecodeBlockTypeAndLength(
   } else {
     BrotliBitReaderState memento;
     BrotliBitReaderSaveState(br, &memento);
-    if (!SafeReadSymbol(type_tree, br, &block_type)) return BROTLI_FALSE;
+    if (!SafeReadSymbol(type_tree, br, &block_type)) {
+      return BROTLI_DECODER_NEEDS_MORE_INPUT;
+    }
     if (!SafeReadBlockLength(s, &s->block_length[tree_type], len_tree, br)) {
       s->substate_read_block_length = BROTLI_STATE_READ_BLOCK_LENGTH_NONE;
       BrotliBitReaderRestoreState(br, &memento);
-      return BROTLI_FALSE;
+      return BROTLI_DECODER_NEEDS_MORE_INPUT;
     }
   }
 
@@ -1217,7 +1219,7 @@ static BROTLI_INLINE BROTLI_BOOL DecodeBlockTypeAndLength(
   }
   ringbuffer[0] = ringbuffer[1];
   ringbuffer[1] = block_type;
-  return BROTLI_TRUE;
+  return BROTLI_DECODER_SUCCESS;
 }
 
 static BROTLI_INLINE void DetectTrivialLiteralBlockTypes(
@@ -1254,62 +1256,68 @@ static BROTLI_INLINE void PrepareLiteralDecoding(BrotliDecoderState* s) {
 
 /* Decodes the block type and updates the state for literal context.
    Reads 3..54 bits. */
-static BROTLI_INLINE BROTLI_BOOL DecodeLiteralBlockSwitchInternal(
+static BROTLI_INLINE BrotliDecoderErrorCode DecodeLiteralBlockSwitchInternal(
     int safe, BrotliDecoderState* s) {
-  if (!DecodeBlockTypeAndLength(safe, s, 0)) {
-    return BROTLI_FALSE;
+  BrotliDecoderErrorCode result = DecodeBlockTypeAndLength(safe, s, 0);
+  if (result != BROTLI_DECODER_SUCCESS) {
+    return result;
   }
   PrepareLiteralDecoding(s);
-  return BROTLI_TRUE;
+  return BROTLI_DECODER_SUCCESS;
 }
 
-static void BROTLI_NOINLINE DecodeLiteralBlockSwitch(BrotliDecoderState* s) {
-  DecodeLiteralBlockSwitchInternal(0, s);
+static BROTLI_NOINLINE BrotliDecoderErrorCode
+DecodeLiteralBlockSwitch(BrotliDecoderState* s) {
+  return DecodeLiteralBlockSwitchInternal(0, s);
 }
 
-static BROTLI_BOOL BROTLI_NOINLINE SafeDecodeLiteralBlockSwitch(
+static BROTLI_NOINLINE BrotliDecoderErrorCode SafeDecodeLiteralBlockSwitch(
     BrotliDecoderState* s) {
   return DecodeLiteralBlockSwitchInternal(1, s);
 }
 
 /* Block switch for insert/copy length.
    Reads 3..54 bits. */
-static BROTLI_INLINE BROTLI_BOOL DecodeCommandBlockSwitchInternal(
+static BROTLI_INLINE BrotliDecoderErrorCode DecodeCommandBlockSwitchInternal(
     int safe, BrotliDecoderState* s) {
-  if (!DecodeBlockTypeAndLength(safe, s, 1)) {
-    return BROTLI_FALSE;
+  BrotliDecoderErrorCode result = DecodeBlockTypeAndLength(safe, s, 1);
+  if (result != BROTLI_DECODER_SUCCESS) {
+    return result;
   }
   s->htree_command = s->insert_copy_hgroup.htrees[s->block_type_rb[3]];
-  return BROTLI_TRUE;
+  return BROTLI_DECODER_SUCCESS;
 }
 
-static void BROTLI_NOINLINE DecodeCommandBlockSwitch(BrotliDecoderState* s) {
-  DecodeCommandBlockSwitchInternal(0, s);
+static BROTLI_NOINLINE BrotliDecoderErrorCode
+DecodeCommandBlockSwitch(BrotliDecoderState* s) {
+  return DecodeCommandBlockSwitchInternal(0, s);
 }
 
-static BROTLI_BOOL BROTLI_NOINLINE SafeDecodeCommandBlockSwitch(
-    BrotliDecoderState* s) {
+static BROTLI_NOINLINE BrotliDecoderErrorCode
+SafeDecodeCommandBlockSwitch(BrotliDecoderState* s) {
   return DecodeCommandBlockSwitchInternal(1, s);
 }
 
 /* Block switch for distance codes.
    Reads 3..54 bits. */
-static BROTLI_INLINE BROTLI_BOOL DecodeDistanceBlockSwitchInternal(
+static BROTLI_INLINE BrotliDecoderErrorCode DecodeDistanceBlockSwitchInternal(
     int safe, BrotliDecoderState* s) {
-  if (!DecodeBlockTypeAndLength(safe, s, 2)) {
-    return BROTLI_FALSE;
+  BrotliDecoderErrorCode result = DecodeBlockTypeAndLength(safe, s, 2);
+  if (result != BROTLI_DECODER_SUCCESS) {
+    return result;
   }
   s->dist_context_map_slice = s->dist_context_map +
       (s->block_type_rb[5] << BROTLI_DISTANCE_CONTEXT_BITS);
   s->dist_htree_index = s->dist_context_map_slice[s->distance_context];
-  return BROTLI_TRUE;
+  return BROTLI_DECODER_SUCCESS;
 }
 
-static void BROTLI_NOINLINE DecodeDistanceBlockSwitch(BrotliDecoderState* s) {
-  DecodeDistanceBlockSwitchInternal(0, s);
+static BROTLI_NOINLINE BrotliDecoderErrorCode
+DecodeDistanceBlockSwitch(BrotliDecoderState* s) {
+  return DecodeDistanceBlockSwitchInternal(0, s);
 }
 
-static BROTLI_BOOL BROTLI_NOINLINE SafeDecodeDistanceBlockSwitch(
+static BROTLI_NOINLINE BrotliDecoderErrorCode SafeDecodeDistanceBlockSwitch(
     BrotliDecoderState* s) {
   return DecodeDistanceBlockSwitchInternal(1, s);
 }
@@ -1940,6 +1948,9 @@ static BROTLI_INLINE BROTLI_BOOL CheckInputAmount(
   return BrotliCheckInputAmount(br);
 }
 
+/* NB: METHOD should return BROTLI_FALSE only in case there is not enough input;
+       in case of "unsafe" execution, when input is guaranteed to be sufficient,
+       result is ignored. */
 #define BROTLI_SAFE(METHOD)                       \
   {                                               \
     if (safe) {                                   \
@@ -1952,6 +1963,22 @@ static BROTLI_INLINE BROTLI_BOOL CheckInputAmount(
     }                                             \
   }
 
+/* NB: METHOD should return BROTLI_DECODER_SUCCESS, BROTLI_DECODER_ERROR_*, or
+   BROTLI_DECODER_NEEDS_MORE_INPUT; the later two break the processing. */
+#define BROTLI_SAFE_WITH_STATUS(METHOD)         \
+  {                                             \
+    BrotliDecoderErrorCode status;              \
+    if (safe) {                                 \
+      status = Safe##METHOD;                    \
+    } else {                                    \
+      status = METHOD;                          \
+    }                                           \
+    if (status != BROTLI_DECODER_SUCCESS) {     \
+      result = status;                          \
+      goto saveStateAndReturn;                  \
+    }                                           \
+  }
+
 static BROTLI_INLINE BrotliDecoderErrorCode ProcessCommandsInternal(
     int safe, BrotliDecoderState* s) {
   int pos = s->pos;
@@ -1991,7 +2018,7 @@ CommandBegin:
     goto saveStateAndReturn;
   }
   if (BROTLI_PREDICT_FALSE(s->block_length[1] == 0)) {
-    BROTLI_SAFE(DecodeCommandBlockSwitch(s));
+    BROTLI_SAFE_WITH_STATUS(DecodeCommandBlockSwitch(s));
     goto CommandBegin;
   }
   /* Read the insert/copy length in the command. */
@@ -2136,7 +2163,7 @@ CommandPostDecodeLiterals:
   } else {
     /* Read distance code in the command, unless it was implicitly zero. */
     if (BROTLI_PREDICT_FALSE(s->block_length[2] == 0)) {
-      BROTLI_SAFE(DecodeDistanceBlockSwitch(s));
+      BROTLI_SAFE_WITH_STATUS(DecodeDistanceBlockSwitch(s));
     }
     BROTLI_SAFE(ReadDistance(s, br));
   }
@@ -2330,7 +2357,7 @@ CommandPostWrapCopy:
   }
 
 NextLiteralBlock:
-  BROTLI_SAFE(DecodeLiteralBlockSwitch(s));
+  BROTLI_SAFE_WITH_STATUS(DecodeLiteralBlockSwitch(s));
   goto CommandInner;
 
 saveStateAndReturn:
@@ -2552,6 +2579,8 @@ BrotliDecoderResult BrotliDecoderDecompressStream(
         if (result != BROTLI_DECODER_SUCCESS) {
           break;
         }
+        BROTLI_DCHECK(s->meta_block_remaining_len <=
+                      (int)BROTLI_BLOCK_SIZE_CAP);
         BROTLI_LOG_UINT(s->is_last_metablock);
         BROTLI_LOG_UINT(s->meta_block_remaining_len);
         BROTLI_LOG_UINT(s->is_metadata);

data/vendor/brotli/c/include/brotli/decode.h

@@ -85,9 +85,7 @@ typedef enum {
   BROTLI_ERROR_CODE(_ERROR_FORMAT_, PADDING_1, -14) SEPARATOR              \
   BROTLI_ERROR_CODE(_ERROR_FORMAT_, PADDING_2, -15) SEPARATOR              \
   BROTLI_ERROR_CODE(_ERROR_FORMAT_, DISTANCE, -16) SEPARATOR               \
-                                                                           \
-  /* -17 code is reserved */                                               \
-                                                                           \
+  BROTLI_ERROR_CODE(_ERROR_FORMAT_, BLOCK_SWITCH, -17) SEPARATOR           \
   BROTLI_ERROR_CODE(_ERROR_, COMPOUND_DICTIONARY, -18) SEPARATOR           \
   BROTLI_ERROR_CODE(_ERROR_, DICTIONARY_NOT_SET, -19) SEPARATOR            \
   BROTLI_ERROR_CODE(_ERROR_, INVALID_ARGUMENTS, -20) SEPARATOR             \

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brotli
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.1
 platform: ruby
 authors:
 - miyucy
@@ -9,7 +9,7 @@ bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
-description: Brotli compressor/decompressor
+description: Native Ruby bindings for Brotli compression and decompression.
 email:
 - fistfvck@gmail.com
 executables: []
@@ -17,20 +17,8 @@ extensions:
 - ext/brotli/extconf.rb
 extra_rdoc_files: []
 files:
-- ".github/workflows/main.yml"
-- ".github/workflows/publish.yml"
-- ".gitignore"
-- ".gitmodules"
-- ".rspec"
-- Dockerfile
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- bin/before_install.sh
-- bin/console
-- bin/setup
-- brotli.gemspec
 - ext/brotli/brotli.c
 - ext/brotli/brotli.h
 - ext/brotli/buffer.c
@@ -40,14 +28,11 @@ files:
 - lib/brotli/reader.rb
 - lib/brotli/version.rb
 - lib/brotli/writer.rb
-- smoke.sh
 - vendor/brotli/LICENSE
 - vendor/brotli/c/common/constants.c
 - vendor/brotli/c/common/constants.h
 - vendor/brotli/c/common/context.c
 - vendor/brotli/c/common/context.h
-- vendor/brotli/c/common/dictionary.bin
-- vendor/brotli/c/common/dictionary.bin.br
 - vendor/brotli/c/common/dictionary.c
 - vendor/brotli/c/common/dictionary.h
 - vendor/brotli/c/common/dictionary_inc.h
@@ -142,7 +127,6 @@ files:
 - vendor/brotli/c/enc/static_dict_lut_inc.h
 - vendor/brotli/c/enc/static_init.c
 - vendor/brotli/c/enc/static_init.h
-- vendor/brotli/c/enc/static_init_lazy.cc
 - vendor/brotli/c/enc/utf8_util.c
 - vendor/brotli/c/enc/utf8_util.h
 - vendor/brotli/c/enc/write_bits.h
@@ -162,14 +146,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.20
 specification_version: 4
-summary: Brotli compressor/decompressor
+summary: Ruby bindings for Brotli compression
 test_files: []

data/.github/workflows/main.yml

@@ -1,37 +0,0 @@
-name: Ruby
-
-on: [pull_request]
-
-jobs:
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [3.1, 3.2, 3.3, 3.4]
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: true
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true
-    - name: Run the default task
-      run: |
-        bundle exec rake clobber
-        bundle exec rake compile -- --enable-vendor
-        bundle exec rake test
-        bundle exec rake build
-        gem install --no-document "$(ls pkg/brotli-*.gem)"
-        cat <<EOF | ruby
-        require "brotli"
-        if Brotli.inflate(Brotli.deflate(File.read("README.md"))) == File.read("README.md")
-          puts "OK"
-          exit 0
-        else
-          puts "NG"
-          exit 0
-        end
-        EOF

data/.github/workflows/publish.yml

@@ -1,24 +0,0 @@
-name: Publish Gem
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  build:
-    if: github.repository == 'miyucy/brotli'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      id-token: write
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: true
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ruby
-        bundler-cache: true
-    - uses: rubygems/release-gem@v1

data/.gitignore

@@ -1,18 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log
-/ext/brotli/common
-/ext/brotli/dec
-/ext/brotli/enc
-/ext/brotli/include

data/.gitmodules

@@ -1,3 +0,0 @@
-[submodule "vendor/brotli"]
-	path = vendor/brotli
-	url = https://github.com/google/brotli.git

data/.rspec

@@ -1,2 +0,0 @@
---format documentation
---color

data/Dockerfile

@@ -1,38 +0,0 @@
-ARG GCC_VERSION=14
-FROM gcc:${GCC_VERSION}
-
-ARG USE_SYSTEM_BROTLI=true
-
-# Install Ruby and development dependencies
-RUN apt-get update && apt-get install -y \
-    git \
-    libbrotli-dev \
-    pkg-config \
-    ruby \
-    ruby-dev \
-    && rm -rf /var/lib/apt/lists/*
-
-# Verify GCC version
-RUN gcc --version
-
-# Set working directory
-WORKDIR /app
-
-# Copy source code
-COPY . .
-
-# Install bundler and dependencies
-RUN gem install bundler
-RUN bundle install
-
-# Build and test
-RUN if [ "${USE_SYSTEM_BROTLI}" = "true" ]; then \
-        echo "Building with system Brotli" && \
-        bundle exec rake compile; \
-    else \
-        echo "Building with vendor Brotli" && \
-        bundle exec rake compile -- --enable-vendor; \
-    fi
-RUN bundle exec rake test
-
-CMD ["bash"]

data/Gemfile

@@ -1,10 +0,0 @@
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in brotli.gemspec
-gemspec
-
-gem "rake", "~> 13.0"
-gem "rake-compiler"
-gem "test-unit", "~> 3.0"
-gem "test-unit-rr"
-gem "rantly"

data/Rakefile

@@ -1,42 +0,0 @@
-require "bundler/setup"
-require "bundler/gem_tasks"
-require "rake/clean"
-require "rake/testtask"
-require "rake/extensiontask"
-
-CLEAN.include("ext/brotli/common")
-CLEAN.include("ext/brotli/dec")
-CLEAN.include("ext/brotli/enc")
-CLEAN.include("ext/brotli/include")
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.test_files = FileList["test/**/*_test.rb"]
-  t.warning = true
-  t.verbose = true
-end
-
-Rake::ExtensionTask.new("brotli") do |ext|
-  ext.lib_dir = "lib/brotli"
-end
-
-task build: :compile
-task test: :compile
-task default: :test
-
-task :docker do
-  gcc_versions = ["14", "15"]
-  brotli_configs = [true, false]
-  gcc_versions.product(brotli_configs).each do |gcc_version, use_system_brotli|
-    command = "docker build "\
-              "--progress=plain "\
-              "--build-arg GCC_VERSION=#{gcc_version} "\
-              "--build-arg USE_SYSTEM_BROTLI=#{use_system_brotli} "\
-              "-t brotli:#{gcc_version}#{use_system_brotli ? "-use_system_brotli" : ""} ."
-    puts "Running: #{command}"
-    system command
-    unless $?.exited?
-      raise "Docker build failed for GCC version #{gcc_version} with use_system_brotli=#{use_system_brotli}"
-    end
-  end
-end

data/bin/before_install.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-set -ev
-gem update --system || gem update --system '2.7.8'
-if [ "$(gem --version | cut -b 1)" = 3 ]; then
-  echo "gem: -N" >> ~/.gemrc
-else
-  echo "gem: --no-ri --no-rdoc" >> ~/.gemrc
-fi
-gem install bundler || gem install bundler -v '< 2'

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "brotli"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start

data/bin/setup

@@ -1,8 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-bundle install
-
-# Ensure Brotli library dependencies are available
-git submodule update --init

data/brotli.gemspec

@@ -1,27 +0,0 @@
-require_relative "lib/brotli/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "brotli"
-  spec.version       = Brotli::VERSION
-  spec.authors       = ["miyucy"]
-  spec.email         = ["fistfvck@gmail.com"]
-
-  spec.summary       = "Brotli compressor/decompressor"
-  spec.description   = "Brotli compressor/decompressor"
-  spec.homepage      = "https://github.com/miyucy/brotli"
-  spec.license       = "MIT"
-
-  tracked_files = Dir.chdir(__dir__) { `git ls-files -z`.split("\x0") }
-  vendored_brotli_files = Dir.chdir(__dir__) do
-    Dir["vendor/brotli/c/{common,enc,dec,include}/**/*"].select { |path| File.file?(path) }
-  end
-
-  spec.files = tracked_files
-               .reject { |path| path == "vendor/brotli" || path.start_with?("test/") }
-               .concat(vendored_brotli_files)
-               .append("vendor/brotli/LICENSE")
-               .sort
-               .uniq
-  spec.require_paths = ["lib"]
-  spec.extensions    = ["ext/brotli/extconf.rb"]
-end

data/smoke.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-gem list | grep brotli && gem uninstall --force brotli
-bundle exec rake clobber build
-gem install --force --local "$(ls pkg/brotli-*.gem)"
-cat <<EOF | ruby
-require 'brotli'
-abort if Brotli.inflate(Brotli.deflate(File.read('smoke.sh'))) != File.read('smoke.sh')
-EOF