diff --git a/ChangeLog b/ChangeLog
index b02735f4e..73a717bfc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-10-13  Werner Lemberg  <wl@gnu.org>
+
+	[truetype] Fix commit from 2015-10-10.
+
+	* src/truetype/ttgxvar.c (ft_var_load_gvar): Add missing error
+	handling body to condition.
+
 2015-10-12  Werner Lemberg  <wl@gnu.org>
 
 	[unix] Make MKDIR_P actually work.
diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c
index b8ff14110..31954e228 100644
--- a/src/truetype/ttgxvar.c
+++ b/src/truetype/ttgxvar.c
@@ -489,6 +489,11 @@
     /* and a single variation needs at least 4 bytes per glyph */
     if ( (FT_ULong)gvar_head.glyphCount *
            ( ( gvar_head.flags & 1 ) ? 8 : 6 ) > table_len )
+    {
+      FT_TRACE1(( "ft_var_load_gvar: invalid number of glyphs\n" ));
+      error = FT_THROW( Invalid_Table );
+      goto Exit;
+    }
 
     FT_TRACE2(( "loaded\n" ));