Update woff2 to 4e698b8

third_party/woff2/src/glyph.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 60 matching lines @@
 }
 
 bool ReadGlyph(const uint8_t* data, size_t len, Glyph* glyph) {
   Buffer buffer(data, len);
 
   int16_t num_contours;
   if (!buffer.ReadS16(&num_contours)) {
     return FONT_COMPRESSION_FAILURE();
   }
 
-  if (num_contours == 0) {
-    // Empty glyph.
-    return true;
-  }
-
   // Read the bounding box.
   if (!buffer.ReadS16(&glyph->x_min) ||
       !buffer.ReadS16(&glyph->y_min) ||
       !buffer.ReadS16(&glyph->x_max) ||
       !buffer.ReadS16(&glyph->y_max)) {
     return FONT_COMPRESSION_FAILURE();
   }
 
+  if (num_contours == 0) {
+    // Empty glyph.
+    return true;
+  }
+
   if (num_contours > 0) {
     // Simple glyph.
     glyph->contours.resize(num_contours);
 
     // Read the number of points per contour.
     uint16_t last_point_index = 0;
     for (int i = 0; i < num_contours; ++i) {
       uint16_t point_index;
       if (!buffer.ReadU16(&point_index)) {
         return FONT_COMPRESSION_FAILURE();
@@ skipping 267 matching lines @@
     StoreInstructions(glyph, &offset, dst);
     if (!StorePoints(glyph, &offset, dst, *dst_size)) {
       return FONT_COMPRESSION_FAILURE();
     }
   }
   *dst_size = offset;
   return true;
 }
 
 } // namespace woff2