Update brotli 11 May 2016 (4cc756) -> 20 May 2016 (4836af)

third_party/brotli/enc/encode.cc

 /* Copyright 2013 Google Inc. All Rights Reserved.
 
    Distributed under MIT license.
    See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
 */
 
 // Implementation of Brotli compressor.
 
 #include "./encode.h"
 
@@ skipping 424 matching lines @@
       last_insert_len_(0),
       last_flush_pos_(0),
       last_processed_pos_(0),
       prev_byte_(0),
       prev_byte2_(0),
       storage_size_(0),
       storage_(0),
       large_table_(NULL),
       cmd_code_numbits_(0),
       command_buf_(NULL),
-      literal_buf_(NULL) {
+      literal_buf_(NULL),
+      is_last_block_emitted_(0) {
   // Sanitize params.
   params_.quality = std::max(0, params_.quality);
   if (params_.lgwin < kMinWindowBits) {
     params_.lgwin = kMinWindowBits;
   } else if (params_.lgwin > kMaxWindowBits) {
     params_.lgwin = kMaxWindowBits;
   }
   if (params_.quality <= 1) {
     params_.lgblock = params_.lgwin;
   } else if (params_.quality < kMinQualityForBlockSplit) {
@@ skipping 120 matching lines @@
 }
 
 bool BrotliCompressor::WriteBrotliData(const bool is_last,
                                        const bool force_flush,
                                        size_t* out_size,
                                        uint8_t** output) {
   const uint64_t delta = input_pos_ - last_processed_pos_;
   const uint8_t* data = ringbuffer_->start();
   const uint32_t mask = ringbuffer_->mask();
 
+  /* Adding more blocks after "last" block is forbidden. */
+  if (is_last_block_emitted_) return false;
+  if (is_last) is_last_block_emitted_ = 1;
+
   if (delta > input_block_size()) {
     return false;
   }
   const uint32_t bytes = static_cast<uint32_t>(delta);
 
   if (params_.quality <= 1) {
     if (delta == 0 && !is_last) {
       // We have no new input data and we don't have to finish the stream, so
       // nothing to do.
       *out_size = 0;
@@ skipping 570 matching lines @@
     }
     if (out_bytes > 0 && !out->Write(output, out_bytes)) {
       return false;
     }
   }
   return true;
 }
 
 
 }  // namespace brotli