src/java.desktop/share/native/libfreetype/src/sfnt/ttcmap.c

@@ -2366,14 +2366,11 @@
         }
 
         /* if `gindex' is invalid, the remaining values */
         /* in this group are invalid, too               */
         if ( gindex >= (FT_UInt)face->num_glyphs )
-        {
-          gindex = 0;
           continue;
-        }
 
         cmap->cur_charcode = char_code;
         cmap->cur_gindex   = gindex;
         cmap->cur_group    = n;
 

@@ -3659,11 +3656,11 @@
 
   FT_CALLBACK_DEF( const char * )
   tt_get_glyph_name( TT_Face  face,
                      FT_UInt  idx )
   {
-    FT_String*  PSname;
+    FT_String*  PSname = NULL;
 
 
     tt_face_get_ps_name( face, idx, &PSname );
 
     return PSname;