* src/base/ftglyph.c (FT_Get_Glyph): Check `slot->advance'.

2 files changed, 17 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 57753f2cc..35b18c12d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2017-06-01  Werner Lemberg  <wl@gnu.org>
 
+	* src/base/ftglyph.c (FT_Get_Glyph): Check `slot->advance'.
+
+2017-06-01  Werner Lemberg  <wl@gnu.org>
+
 	[psaux] 32bit integer overflow tun-time errors (#46149).
 
 	* src/psaux/t1decode.c (t1_decoder_parse_charstrings): Use
diff --git a/src/base/ftglyph.c b/src/base/ftglyph.c
index 9bfb33050..62d94cbd3 100644
--- a/src/base/ftglyph.c
+++ b/src/base/ftglyph.c
@@ -408,6 +408,19 @@
       goto Exit;
 
     /* copy advance while converting 26.6 to 16.16 format */
+    if ( slot->advance.x >=  0x8000L * 64 ||
+         slot->advance.x <= -0x8000L * 64 )
+    {
+      FT_ERROR(( "FT_Get_Glyph: advance width too large\n" ));
+      return FT_THROW( Invalid_Argument );
+    }
+    if ( slot->advance.y >=  0x8000L * 64 ||
+         slot->advance.y <= -0x8000L * 64 )
+    {
+      FT_ERROR(( "FT_Get_Glyph: advance height too large\n" ));
+      return FT_THROW( Invalid_Argument );
+    }
+
     glyph->advance.x = slot->advance.x * 1024;
     glyph->advance.y = slot->advance.y * 1024;