commit ec62c527eb34ee4481a0153ceb42dfd35d7e1d26
author Makoto Onuki <omakoto@google.com> Tue Jun 09 16:35:08 2015 -0700
committer Makoto Onuki <omakoto@google.com> Wed Jun 10 14:52:29 2015 -0700
tree 7e67208cafc4572557e8d10469fb5dc173ca2edf
parent b7aab0ad37ad69279e367e5960912fc3ff778233

Update to freetype 2.6.0

Bug 18751561

Change-Id: I871cc2925dc5908ec48073e11ecffad1924bbf50

src/sfnt/ttkern.c

diff --git a/src/sfnt/ttkern.c b/src/sfnt/ttkern.c
index 32c4008..4fccc53 100644
--- a/src/sfnt/ttkern.c
+++ b/src/sfnt/ttkern.c
@@ -5,7 +5,7 @@
 /*    Load the basic TrueType kerning table.  This doesn't handle          */
 /*    kerning data within the GPOS table at the moment.                    */
 /*                                                                         */
-/*  Copyright 1996-2007, 2009, 2010, 2013 by                               */
+/*  Copyright 1996-2015 by                                                 */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -99,7 +99,7 @@
       length   = FT_NEXT_USHORT( p );
       coverage = FT_NEXT_USHORT( p );
 
-      if ( length <= 6 )
+      if ( length <= 6 + 8 )
         break;
 
       p_next += length;
@@ -108,8 +108,8 @@
         p_next = p_limit;
 
       /* only use horizontal kerning tables */
-      if ( ( coverage & ~8 ) != 0x0001 ||
-           p + 8 > p_limit             )
+      if ( ( coverage & ~8U ) != 0x0001 ||
+           p + 8 > p_limit              )
         goto NextTable;
 
       num_pairs = FT_NEXT_USHORT( p );