private sync

[framework/graphics/freetype.git] / src / bdf / bdflib.c

diff --git a/src/bdf/bdflib.c b/src/bdf/bdflib.c
index b7b6857..9009a5e 100644 (file)
--- a/src/bdf/bdflib.c
+++ b/src/bdf/bdflib.c
@@ -1626,12 +1626,16 @@
       if ( p->glyph_enc == -1 && p->list.used > 2 )
         p->glyph_enc = _bdf_atol( p->list.field[2], 0, 10 );
 
+       if ( p->glyph_enc < -1 )
+               p->glyph_enc = -1;
+
       FT_TRACE4(( DBGMSG2, p->glyph_enc ));
 
       /* Check that the encoding is in the Unicode range because  */
       /* otherwise p->have (a bitmap with static size) overflows. */
       if ( p->glyph_enc > 0                               &&
-           (size_t)p->glyph_enc >= sizeof ( p->have ) * 8 )
+           (size_t)p->glyph_enc >= sizeof ( p->have ) /
+                                                       sizeof ( unsigned long ) * 32)
       {
         FT_ERROR(( "_bdf_parse_glyphs: " ERRMSG5, lineno, "ENCODING" ));
         error = BDF_Err_Invalid_File_Format;
@@ -2171,7 +2175,10 @@
       p->cnt = p->font->props_size = _bdf_atoul( p->list.field[1], 0, 10 );
 
       if ( FT_NEW_ARRAY( p->font->props, p->cnt ) )
-        goto Exit;
+         {
+                 p->font->props_size = 0;
+                 goto Exit;
+         }
 
       p->flags |= _BDF_PROPS;
       *next     = _bdf_parse_properties;