Update woff2 to cbea7b9

third_party/woff2/src/font.cc

 // Copyright 2013 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,
@@ skipping 87 matching lines @@
 
   // Check that tables are non-overlapping.
   uint32_t last_offset = 12UL + 16UL * font->num_tables;
   for (const auto& i : intervals) {
     if (i.first < last_offset || i.first + i.second < i.first) {
       return FONT_COMPRESSION_FAILURE();
     }
     last_offset = i.first + i.second;
   }
 
+  // Sanity check key tables
+  const Font::Table* head_table = font->FindTable(kHeadTableTag);
+  if (head_table != NULL && head_table->length < 52) {
+    return FONT_COMPRESSION_FAILURE();
+  }
+
   return true;
 }
 
 bool ReadCollectionFont(Buffer* file, const uint8_t* data, size_t len,
                         Font* font,
                         std::map<uint32_t, Font::Table*>* all_tables) {
   if (!file->ReadU32(&font->flavor)) {
     return FONT_COMPRESSION_FAILURE();
   }
   if (!ReadTrueTypeFont(file, data, len, font)) {
@@ skipping 56 matching lines @@
   if (font->flavor == kTtcFontFlavor) {
     return FONT_COMPRESSION_FAILURE();
   }
   return ReadTrueTypeFont(&file, data, len, font);
 }
 
 bool ReadFontCollection(const uint8_t* data, size_t len,
                         FontCollection* font_collection) {
   Buffer file(data, len);
 
-  uint32_t flavor;
-  if (!file.ReadU32(&flavor)) {
+  if (!file.ReadU32(&font_collection->flavor)) {
     return FONT_COMPRESSION_FAILURE();
   }
 
-  if (flavor != kTtcFontFlavor) {
+  if (font_collection->flavor != kTtcFontFlavor) {
     font_collection->fonts.resize(1);
     Font& font = font_collection->fonts[0];
-    font.flavor = flavor;
+    font.flavor = font_collection->flavor;
     return ReadTrueTypeFont(&file, data, len, &font);
   }
   return ReadTrueTypeCollection(&file, data, len, font_collection);
 }
 
 size_t FontFileSize(const Font& font) {
   size_t max_offset = 12ULL + 16ULL * font.num_tables;
   for (const auto& i : font.tables) {
     const Font::Table& table = i.second;
     size_t padding_size = (4 - (table.length & 3)) & 3;
@@ skipping 76 matching lines @@
   }
 
   return true;
 }
 
 bool WriteFontCollection(const FontCollection& font_collection, uint8_t* dst,
                          size_t dst_size) {
   size_t offset = 0;
 
   // It's simpler if this just a simple sfnt
-  if (font_collection.fonts.size() == 1) {
+  if (font_collection.flavor != kTtcFontFlavor) {
     return WriteFont(font_collection.fonts[0], &offset, dst, dst_size);
   }
 
   // Write TTC header
   StoreU32(kTtcFontFlavor, &offset, dst);
   StoreU32(font_collection.header_version, &offset, dst);
   StoreU32(font_collection.fonts.size(), &offset, dst);
 
   // Offset Table, zeroed for now
   size_t offset_table = offset;  // where to write offsets later
@@ skipping 88 matching lines @@
   std::map<uint32_t, Font::Table>::iterator it =
       font->tables.find(kDsigTableTag);
   if (it != font->tables.end()) {
     font->tables.erase(it);
     font->num_tables = font->tables.size();
   }
   return true;
 }
 
 } // namespace woff2