Sat Jul 26 10:52:20 2003  Owen Taylor  <otaylor@redhat.com>

	* pango/opentype/ftxgpos.c (Lookup_ContextPos2): 
	* pango/opentype/ftxgsub.c (Lookup_ContextSubst2): Move
	allocation afer initial checks, fixing memory leak.

	* pango/opentype/ftxgsub.c (Lookup_ChainContextSubst2): 
	Fix some more error return memory leaks that weren't
	fixed in the Qt changes.

Index: ftxgpos.c
===================================================================
RCS file: /cvs/gnome/pango/pango/opentype/ftxgpos.c,v
retrieving revision 1.15
diff -u -p -r1.15 ftxgpos.c
--- ftxgpos.c	26 Jul 2003 14:50:23 -0000	1.15
+++ ftxgpos.c	26 Jul 2003 14:59:48 -0000
@@ -4020,9 +4020,6 @@
 
     gdef = gpos->gdef;
 
-    if ( ALLOC_ARRAY( classes, cpf2->MaxContextLength, FT_UShort ) )
-      return error;
-
     if ( CHECK_Property( gdef, in->string[in->pos], flags, &property ) )
       return error;
 
@@ -4032,7 +4029,10 @@
 
     error = Coverage_Index( &cpf2->Coverage, in->string[in->pos], &index );
     if ( error )
-      goto End;
+      return error;
+
+    if ( ALLOC_ARRAY( classes, cpf2->MaxContextLength, FT_UShort ) )
+      return error;
 
     error = Get_Class( &cpf2->ClassDef, in->string[in->pos],
                        &classes[0], NULL );
Index: ftxgsub.c
===================================================================
RCS file: /cvs/gnome/pango/pango/opentype/ftxgsub.c,v
retrieving revision 1.10
diff -u -p -r1.10 ftxgsub.c
--- ftxgsub.c	26 Jul 2003 14:50:23 -0000	1.10
+++ ftxgsub.c	26 Jul 2003 14:59:49 -0000
@@ -2206,9 +2206,6 @@
 
     gdef = gsub->gdef;
 
-    if ( ALLOC_ARRAY( classes, csf2->MaxContextLength, FT_UShort ) )
-      return error;
-
     if ( CHECK_Property( gdef, in->string[in->pos], flags, &property ) )
       return error;
 
@@ -2218,7 +2215,10 @@
 
     error = Coverage_Index( &csf2->Coverage, in->string[in->pos], &index );
     if ( error )
-      goto End;
+      return error;
+
+    if ( ALLOC_ARRAY( classes, csf2->MaxContextLength, FT_UShort ) )
+      return error;
 
     error = Get_Class( &csf2->ClassDef, in->string[in->pos],
                        &classes[0], NULL );
@@ -3646,7 +3646,7 @@
           while ( CHECK_Property( gdef, s_in[j], flags, &property ) )
           {
             if ( error && error != TTO_Err_Not_Covered )
-              return error;
+              goto End1;
 
             if ( j > curr_pos )
               j--;
@@ -3720,7 +3720,7 @@
         while ( CHECK_Property( gdef, s_in[j], flags, &property ) )
         {
           if ( error && error != TTO_Err_Not_Covered )
-            return error;
+            goto End1;
 
           if ( curr_pos + j < in->length )
             j++;