Update freetype to the latest version of Android external/freetype

src/psaux/t1decode.c

 /***************************************************************************/
 /*                                                                         */
 /*  t1decode.c                                                             */
 /*                                                                         */
 /*    PostScript Type 1 decoding routines (body).                          */
 /*                                                                         */
 /*  Copyright 2000-2011 by                                                 */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ skipping 181 matching lines @@
     FT_Error     error;
     FT_Int       bchar_index, achar_index;
 #if 0
     FT_Int       n_base_points;
     FT_Outline*  base = decoder->builder.base;
 #endif
     FT_Vector    left_bearing, advance;
 
 #ifdef FT_CONFIG_OPTION_INCREMENTAL
     T1_Face      face  = (T1_Face)decoder->builder.face;
-#endif     
+#endif
 
 
     if ( decoder->seac )
     {
       FT_ERROR(( "t1operator_seac: invalid nested seac\n" ));
       return PSaux_Err_Syntax_Error;
     }
 
     /* seac weirdness */
     adx += decoder->builder.left_bearing.x;
@@ skipping 180 matching lines @@
     hinter = (T1_Hints_Funcs)builder->hints_funcs;
 
     /* a font that reads BuildCharArray without setting */
     /* its values first is buggy, but ...               */
     FT_ASSERT( ( decoder->len_buildchar == 0 ) ==
                ( decoder->buildchar == NULL )  );
 
     if ( decoder->buildchar && decoder->len_buildchar > 0 )
       ft_memset( &decoder->buildchar[0],
                  0,
-                 sizeof( decoder->buildchar[0] ) * decoder->len_buildchar );
+                 sizeof ( decoder->buildchar[0] ) * decoder->len_buildchar );
 
     FT_TRACE4(( "\n"
                 "Start charstring\n" ));
 
     zone->base           = charstring_base;
     limit = zone->limit  = charstring_base + charstring_len;
     ip    = zone->cursor = zone->base;
 
     error = PSaux_Err_Ok;
 
@@ skipping 343 matching lines @@
           break;
 
         case 2:                     /* add flex vectors */
           {
             FT_Int  idx;
 
 
             if ( arg_cnt != 0 )
               goto Unexpected_OtherSubr;
 
+            if ( decoder->flex_state == 0 )
+            {
+              FT_ERROR(( "t1_decoder_parse_charstrings:"
+                         " missing flex start\n" ));
+              goto Syntax_Error;
+            }
+
             /* note that we should not add a point for index 0; */
             /* this will move our current position to the flex  */
             /* point without adding any point to the outline    */
             idx = decoder->num_flex_vectors++;
             if ( idx > 0 && idx < 7 )
               t1_builder_add_point( builder,
                                     x,
                                     y,
                                     (FT_Byte)( idx == 3 || idx == 6 ) );
           }
@@ skipping 89 matching lines @@
 
             idx = Fix2Int( top[0] );
 
             if ( idx < 0                                           ||
                  idx + blend->num_designs > decoder->len_buildchar )
               goto Unexpected_OtherSubr;
 
             ft_memcpy( &decoder->buildchar[idx],
                        blend->weight_vector,
                        blend->num_designs *
-                         sizeof( blend->weight_vector[0] ) );
+                         sizeof ( blend->weight_vector[0] ) );
           }
           break;
 
         case 20:
           /* <arg1> <arg2> 2 20 callothersubr pop   */
           /* ==> push <arg1> + <arg2> onto T1 stack */
           if ( arg_cnt != 2 )
             goto Unexpected_OtherSubr;
 
           top[0] += top[1]; /* XXX (over|under)flow */
@@ skipping 212 matching lines @@
 #ifdef FT_DEBUG_LEVEL_TRACE
 
           if ( decoder->len_buildchar > 0 )
           {
             FT_UInt  i;
 
 
             FT_TRACE4(( "BuildCharArray = [ " ));
 
             for ( i = 0; i < decoder->len_buildchar; ++i )
-              FT_TRACE4(( "%d ", decoder->buildchar[ i ] ));
+              FT_TRACE4(( "%d ", decoder->buildchar[i] ));
 
             FT_TRACE4(( "]\n" ));
           }
 
 #endif /* FT_DEBUG_LEVEL_TRACE */
 
           FT_TRACE4(( "\n" ));
 
           /* return now! */
           return PSaux_Err_Ok;
@@ skipping 478 matching lines @@
 
   /* finalize T1 decoder */
   FT_LOCAL_DEF( void )
   t1_decoder_done( T1_Decoder  decoder )
   {
     t1_builder_done( &decoder->builder );
   }
 
 
 /* END */