Update woff2 to cbea7b9

third_party/woff2/src/woff2_dec.cc

 // Copyright 2014 Google Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
 // Library for converting WOFF2 format font files to their TTF versions.
 
 #include "./woff2_dec.h"
 
 #include <stdlib.h>
 #include <algorithm>
-#include <brotli/decode.h>
 #include <complex>
 #include <cstring>
 #include <limits>
 #include <string>
 #include <vector>
 #include <map>
 #include <memory>
 #include <utility>
 
+#include "./brotli/decode.h"
 #include "./buffer.h"
 #include "./port.h"
 #include "./round.h"
 #include "./store_bytes.h"
 #include "./table_tags.h"
 #include "./variable_length.h"
 #include "./woff2_common.h"
 
 namespace woff2 {
 
@@ skipping 633 matching lines @@
     return FONT_COMPRESSION_FAILURE();
   }
 
   assert(x_mins.size() == num_glyphs);
 
   // num_glyphs 0 is OK if there is no 'glyf' but cannot then xform 'hmtx'.
   if (PREDICT_FALSE(num_hmetrics > num_glyphs)) {
     return FONT_COMPRESSION_FAILURE();
   }
 
+  // https://www.microsoft.com/typography/otspec/hmtx.htm
+  // "...only one entry need be in the array, but that entry is required."
+  if (PREDICT_FALSE(num_hmetrics < 1)) {
+    return FONT_COMPRESSION_FAILURE();
+  }
+
   for (uint16_t i = 0; i < num_hmetrics; i++) {
     uint16_t advance_width;
     if (PREDICT_FALSE(!hmtx_buff_in.ReadU16(&advance_width))) {
       return FONT_COMPRESSION_FAILURE();
     }
     advance_widths.push_back(advance_width);
   }
 
   for (uint16_t i = 0; i < num_hmetrics; i++) {
     int16_t lsb;
@@ skipping 38 matching lines @@
 
   return true;
 }
 
 bool Woff2Uncompress(uint8_t* dst_buf, size_t dst_size,
   const uint8_t* src_buf, size_t src_size) {
   size_t uncompressed_size = dst_size;
   BrotliDecoderResult result = BrotliDecoderDecompress(
       src_size, src_buf, &uncompressed_size, dst_buf);
   if (PREDICT_FALSE(result != BROTLI_DECODER_RESULT_SUCCESS ||
-      uncompressed_size != dst_size)) {
+                    uncompressed_size != dst_size)) {
     return FONT_COMPRESSION_FAILURE();
   }
   return true;
 }
 
 bool ReadTableDirectory(Buffer* file, std::vector<Table>* tables,
     size_t num_tables) {
   uint32_t src_offset = 0;
   for (size_t i = 0; i < num_tables; ++i) {
     Table* table = &(*tables)[i];
@@ skipping 158 matching lines @@
         if (table.tag == kHeadTableTag) {
           if (PREDICT_FALSE(table.src_length < 12)) {
             return FONT_COMPRESSION_FAILURE();
           }
           // checkSumAdjustment = 0
           StoreU32(transformed_buf + table.src_offset, 8, 0);
         }
         table.dst_offset = dest_offset;
         checksum = ComputeULongSum(transformed_buf + table.src_offset,
                                    table.src_length);
-        out->Write(transformed_buf + table.src_offset, table.src_length);
+        if (PREDICT_FALSE(!out->Write(transformed_buf + table.src_offset,
+            table.src_length))) {
+          return FONT_COMPRESSION_FAILURE();
+        }
       } else {
         if (table.tag == kGlyfTableTag) {
           table.dst_offset = dest_offset;
 
           Table* loca_table = FindTable(&tables, kLocaTableTag);
           if (PREDICT_FALSE(!ReconstructGlyf(transformed_buf + table.src_offset,
               &table, &checksum, loca_table, &loca_checksum, info, out))) {
             return FONT_COMPRESSION_FAILURE();
           }
         } else if (table.tag == kLocaTableTag) {
@@ skipping 369 matching lines @@
                                        hdr.uncompressed_size,
                                        &metadata, &hdr, i, out))) {
       return FONT_COMPRESSION_FAILURE();
     }
   }
 
   return true;
 }
 
 } // namespace woff2