commit af8346172a7b573715134f7a51e6c5c60fa7f2ab
author Werner Lemberg <wl@gnu.org> Sat Nov 22 13:29:10 2014 +0100
committer Werner Lemberg <wl@gnu.org> Sat Nov 22 13:29:10 2014 +0100
tree 91479cdd9c633e739d4f085582a0eb658b1d7c94
parent 42fcd6693ec7bd6ffc65ddc63e74287a65dda669

[bdf] Fix Savannah bug #43660.

* src/bdf/bdflib.c (_bdf_parse_glyphs) <"ENDFONT">: Check
`_BDF_GLYPH_BITS'.

src/bdf/bdflib.c

diff --git a/src/bdf/bdflib.c b/src/bdf/bdflib.c
index c128526..369c111 100644
--- a/src/bdf/bdflib.c
+++ b/src/bdf/bdflib.c
@@ -1555,6 +1555,14 @@
     /* Check for the ENDFONT field. */
     if ( _bdf_strncmp( line, "ENDFONT", 7 ) == 0 )
     {
+      if ( p->flags & _BDF_GLYPH_BITS )
+      {
+        /* Missing ENDCHAR field. */
+        FT_ERROR(( "_bdf_parse_glyphs: " ERRMSG1, lineno, "ENDCHAR" ));
+        error = FT_THROW( Corrupted_Font_Glyphs );
+        goto Exit;
+      }
+
       /* Sort the glyphs by encoding. */
       ft_qsort( (char *)font->glyphs,
                 font->glyphs_used,