Update freetype to the latest version of Android external/freetype

src/psaux/psconv.c

 /***************************************************************************/
 /*                                                                         */
 /*  psconv.c                                                               */
 /*                                                                         */
 /*    Some convenience conversions (body).                                 */
 /*                                                                         */
-/*  Copyright 2006, 2008, 2009 by                                          */
+/*  Copyright 2006, 2008, 2009, 2012 by                                    */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
 /*  modified, and distributed under the terms of the FreeType project      */
 /*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
 /*  this file you indicate that you have read the license and              */
 /*  understand and accept it fully.                                        */
 /*                                                                         */
 /***************************************************************************/
 
@@ skipping 54 matching lines @@
   FT_LOCAL_DEF( FT_Int )
   PS_Conv_Strtol( FT_Byte**  cursor,
                   FT_Byte*   limit,
                   FT_Int     base )
   {
     FT_Byte*  p = *cursor;
     FT_Int    num = 0;
     FT_Bool   sign = 0;
 
 
-    if ( p == limit || base < 2 || base > 36 )
+    if ( p >= limit || base < 2 || base > 36 )
       return 0;
 
     if ( *p == '-' || *p == '+' )
     {
       sign = FT_BOOL( *p == '-' );
 
       p++;
       if ( p == limit )
         return 0;
     }
@@ skipping 50 matching lines @@
   PS_Conv_ToFixed( FT_Byte**  cursor,
                    FT_Byte*   limit,
                    FT_Int     power_ten )
   {
     FT_Byte*  p = *cursor;
     FT_Fixed  integral;
     FT_Long   decimal = 0, divider = 1;
     FT_Bool   sign = 0;
 
 
-    if ( p == limit )
+    if ( p >= limit )
       return 0;
 
     if ( *p == '-' || *p == '+' )
     {
       sign = FT_BOOL( *p == '-' );
 
       p++;
       if ( p == limit )
         return 0;
     }
@@ skipping 175 matching lines @@
     FT_Byte*  p;
     FT_UInt   r   = 0;
     FT_UInt   w   = 0;
     FT_UInt   pad = 0x01;
 
 
     n *= 2;
 
 #if 1
 
-    p  = *cursor;
+    p = *cursor;
+
+    if ( p >= limit )
+      return 0;
+
     if ( n > (FT_UInt)( limit - p ) )
       n = (FT_UInt)( limit - p );
 
     /* we try to process two nibbles at a time to be as fast as possible */
     for ( ; r < n; r++ )
     {
       FT_UInt  c = p[r];
 
 
       if ( IS_PS_SPACE( c ) )
@@ skipping 67 matching lines @@
                        FT_UShort*  seed )
   {
     FT_Byte*  p;
     FT_UInt   r;
     FT_UInt   s = *seed;
 
 
 #if 1
 
     p = *cursor;
+
+    if ( p >= limit )
+      return 0;
+
     if ( n > (FT_UInt)(limit - p) )
       n = (FT_UInt)(limit - p);
 
     for ( r = 0; r < n; r++ )
     {
       FT_UInt  val = p[r];
       FT_UInt  b   = ( val ^ ( s >> 8 ) );
 
 
       s         = ( (val + s)*52845U + 22719 ) & 0xFFFFU;
@@ skipping 16 matching lines @@
     *cursor = p;
     *seed   = s;
 
 #endif /* 0 */
 
     return r;
   }
 
 
 /* END */