From 7341a116916c8470f1211f0cb3c65b189b42ec9e Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@gnome.org>
Date: Tue, 3 Apr 2007 22:45:29 +0000
Subject: [PATCH] Copy fixes from harfbuzz stable branch. Includes a leak fix,
 a kerning

2007-04-03  Behdad Esfahbod  <behdad@gnome.org>

        * pango/opentype/harfbuzz-gdef.c (_HB_GDEF_Check_Property):
        * pango/opentype/harfbuzz-gpos.c (HB_Done_GPOS_Table),
        (Lookup_PairPos):
        * pango/opentype/harfbuzz-open.c (Get_Class1):
        Copy fixes from harfbuzz stable branch.  Includes a leak fix,
        a kerning fix, and an array out-of-bound access fix.
---
 src/harfbuzz-gdef.c | 2 ++
 src/harfbuzz-gpos.c | 8 ++++++++
 src/harfbuzz-open.c | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/harfbuzz-gdef.c b/src/harfbuzz-gdef.c
index 5a649debe..7a30d8bdc 100644
--- a/src/harfbuzz-gdef.c
+++ b/src/harfbuzz-gdef.c
@@ -1217,6 +1217,8 @@ FT_Error  _HB_GDEF_Check_Property( HB_GDEFHeader*  gdef,
 	   *property != desired_attachment_class )
 	return HB_Err_Not_Covered;
     }
+  } else {
+      *property = 0;
   }
 
   return FT_Err_Ok;
diff --git a/src/harfbuzz-gpos.c b/src/harfbuzz-gpos.c
index 3461279fa..513f3fb5b 100644
--- a/src/harfbuzz-gpos.c
+++ b/src/harfbuzz-gpos.c
@@ -193,6 +193,8 @@ FT_Error  HB_Done_GPOS_Table( HB_GPOSHeader* gpos )
   _HB_OPEN_Free_FeatureList( &gpos->FeatureList, memory );
   _HB_OPEN_Free_ScriptList( &gpos->ScriptList, memory );
 
+  FREE( gpos );
+
   return FT_Err_Ok;
 }
 
@@ -1650,6 +1652,12 @@ static FT_Error  Lookup_PairPos( GPOS_Instance*    gpi,
     return HB_Err_Invalid_GPOS_SubTable_Format;
   }
 
+  /* if we don't have coverage for the second glyph don't skip it for
+     further lookups but reset in_pos back to the first_glyph and let
+     the caller in Do_String_Lookup increment in_pos */
+  if ( error == HB_Err_Not_Covered )
+      buffer->in_pos = first_pos;
+
   /* adjusting the `next' glyph */
 
   if ( pp->ValueFormat2 )
diff --git a/src/harfbuzz-open.c b/src/harfbuzz-open.c
index e836df1ea..fa5404016 100644
--- a/src/harfbuzz-open.c
+++ b/src/harfbuzz-open.c
@@ -1191,7 +1191,7 @@ static FT_Error  Get_Class1( HB_ClassDefFormat1*  cdf1,
     *index = 0;
 
   if ( glyphID >= cdf1->StartGlyph &&
-       glyphID <= cdf1->StartGlyph + cdf1->GlyphCount )
+       glyphID < cdf1->StartGlyph + cdf1->GlyphCount )
   {
     *class = cva[glyphID - cdf1->StartGlyph];
     return FT_Err_Ok;