Move allocation afer initial checks, fixing memory leak.

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.

7 files changed, 60 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 9855f341..484a0b31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+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.
+
 Sat Jul 26 10:43:20 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/opentype/ftxgsub.c pango/opentype/ftxgpos.c:
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 9855f341..484a0b31 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,13 @@
+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.
+
 Sat Jul 26 10:43:20 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/opentype/ftxgsub.c pango/opentype/ftxgpos.c:
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 9855f341..484a0b31 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,13 @@
+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.
+
 Sat Jul 26 10:43:20 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/opentype/ftxgsub.c pango/opentype/ftxgpos.c:
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 9855f341..484a0b31 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,13 @@
+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.
+
 Sat Jul 26 10:43:20 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/opentype/ftxgsub.c pango/opentype/ftxgpos.c:
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 9855f341..484a0b31 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,13 @@
+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.
+
 Sat Jul 26 10:43:20 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/opentype/ftxgsub.c pango/opentype/ftxgpos.c:
diff --git a/pango/opentype/ftxgpos.c b/pango/opentype/ftxgpos.c
index 10267e0a..7a17e1cc 100644
--- a/pango/opentype/ftxgpos.c
+++ b/pango/opentype/ftxgpos.c
@@ -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 );
diff --git a/pango/opentype/ftxgsub.c b/pango/opentype/ftxgsub.c
index c2a59baa..aedc551a 100644
--- a/pango/opentype/ftxgsub.c
+++ b/pango/opentype/ftxgsub.c
@@ -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++;