[freetype2] master 545a481: * src/sfnt/sfwoff2.c (reconstruct_glyf): Check `triplet_size'.

[Werner LEMBERG]

branch: master
commit 545a481a74a3c3b70af8928793a01a84f8b0ee9b
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    * src/sfnt/sfwoff2.c (reconstruct_glyf): Check `triplet_size'.
    
    Reported as
    
      https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=18108
---
 ChangeLog          | 12 ++++++++++--
 src/sfnt/sfwoff2.c |  5 +++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8fad2ed..ba34606 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,17 @@
+2019-10-10  Werner Lemberg  <address@hidden>
+
+       * src/sfnt/sfwoff2.c (reconstruct_glyf): Check `triplet_size'.
+
+       Reported as
+
+         https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=18108
+
 2019-10-09  John Tytgat  <address@hidden>
 
        [cff] Fix FT_FACE_FLAG_GLYPH_NAMES for CFF2 based fonts (#57023).
 
-       * src/cff/cffobjs.c (cff_face_init): Don't set FT_FACE_FLAG_GLYPH_NAMES
-       for CFF2 based fonts.
+       * src/cff/cffobjs.c (cff_face_init): Don't set
+       FT_FACE_FLAG_GLYPH_NAMES for CFF2 based fonts.
 
 2019-10-08  Werner Lemberg  <address@hidden>
 
diff --git a/src/sfnt/sfwoff2.c b/src/sfnt/sfwoff2.c
index 01d5bb2..db0fb7a 100644
--- a/src/sfnt/sfwoff2.c
+++ b/src/sfnt/sfwoff2.c
@@ -1070,6 +1070,11 @@
         flags_buf   = stream->base + substreams[FLAG_STREAM].offset;
         triplet_buf = stream->base + substreams[GLYPH_STREAM].offset;
 
+        if ( substreams[GLYPH_STREAM].size <
+               ( substreams[GLYPH_STREAM].offset -
+                 substreams[GLYPH_STREAM].start ) )
+          goto Fail;
+
         triplet_size       = substreams[GLYPH_STREAM].size -
                                ( substreams[GLYPH_STREAM].offset -
                                  substreams[GLYPH_STREAM].start );