When loading in Load_Chain{Sub,Pos}ClassRule, the limit we have only

Tue Apr 15 11:49:39 2003  Owen Taylor  <otaylor@redhat.com>

        * pango/opentype/ftxg{sub/pos}.c: When loading
        in Load_Chain{Sub,Pos}ClassRule, the limit we
        have only applies to the input ClassDef table.
        Fixes problem with Arial Unicode. Much help from
        Noah Levitt in tracing this down.

7 files changed, 48 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 2f4eda6d..9d34d7cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Apr 15 11:49:39 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/opentype/ftxg{sub/pos}.c: When loading
+	in Load_Chain{Sub,Pos}ClassRule, the limit we
+	have only applies to the input ClassDef table.
+	Fixes problem with Arial Unicode. Much help from 
+	Noah Levitt in tracing this down.
+
 Tue Apr 15 09:19:21 2003  Owen Taylor  <otaylor@redhat.com>
  
  	* pango/fonts.c (pango_font_description_set_family): 
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 2f4eda6d..9d34d7cd 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,11 @@
+Tue Apr 15 11:49:39 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/opentype/ftxg{sub/pos}.c: When loading
+	in Load_Chain{Sub,Pos}ClassRule, the limit we
+	have only applies to the input ClassDef table.
+	Fixes problem with Arial Unicode. Much help from 
+	Noah Levitt in tracing this down.
+
 Tue Apr 15 09:19:21 2003  Owen Taylor  <otaylor@redhat.com>
  
  	* pango/fonts.c (pango_font_description_set_family): 
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 2f4eda6d..9d34d7cd 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,11 @@
+Tue Apr 15 11:49:39 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/opentype/ftxg{sub/pos}.c: When loading
+	in Load_Chain{Sub,Pos}ClassRule, the limit we
+	have only applies to the input ClassDef table.
+	Fixes problem with Arial Unicode. Much help from 
+	Noah Levitt in tracing this down.
+
 Tue Apr 15 09:19:21 2003  Owen Taylor  <otaylor@redhat.com>
  
  	* pango/fonts.c (pango_font_description_set_family): 
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 2f4eda6d..9d34d7cd 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,11 @@
+Tue Apr 15 11:49:39 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/opentype/ftxg{sub/pos}.c: When loading
+	in Load_Chain{Sub,Pos}ClassRule, the limit we
+	have only applies to the input ClassDef table.
+	Fixes problem with Arial Unicode. Much help from 
+	Noah Levitt in tracing this down.
+
 Tue Apr 15 09:19:21 2003  Owen Taylor  <otaylor@redhat.com>
  
  	* pango/fonts.c (pango_font_description_set_family): 
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 2f4eda6d..9d34d7cd 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,11 @@
+Tue Apr 15 11:49:39 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/opentype/ftxg{sub/pos}.c: When loading
+	in Load_Chain{Sub,Pos}ClassRule, the limit we
+	have only applies to the input ClassDef table.
+	Fixes problem with Arial Unicode. Much help from 
+	Noah Levitt in tracing this down.
+
 Tue Apr 15 09:19:21 2003  Owen Taylor  <otaylor@redhat.com>
  
  	* pango/fonts.c (pango_font_description_set_family): 
diff --git a/pango/opentype/ftxgpos.c b/pango/opentype/ftxgpos.c
index 55832872..d7a4e137 100644
--- a/pango/opentype/ftxgpos.c
+++ b/pango/opentype/ftxgpos.c
@@ -4832,13 +4832,14 @@
     lookahead_offset = GET_UShort();
 
     /* `ChainPosClassSetCount' is the upper limit for input class values,
-       thus we read it now to make an additional safety check.            */
+       thus we read it now to make an additional safety check. No limit
+       is known or needed for the other two class definitions          */
 
     count = ccpf2->ChainPosClassSetCount = GET_UShort();
 
     FORGET_Frame();
 
-    if ( ( error = Load_EmptyOrClassDefinition( &ccpf2->BacktrackClassDef, count,
+    if ( ( error = Load_EmptyOrClassDefinition( &ccpf2->BacktrackClassDef, 65535,
 						backtrack_offset, base_offset,
 						stream ) ) != TT_Err_Ok )
       goto Fail5;
@@ -4846,7 +4847,7 @@
 						input_offset, base_offset,
 						stream ) ) != TT_Err_Ok )
       goto Fail4;
-    if ( ( error = Load_EmptyOrClassDefinition( &ccpf2->LookaheadClassDef, count,
+    if ( ( error = Load_EmptyOrClassDefinition( &ccpf2->LookaheadClassDef, 65535,
 						lookahead_offset, base_offset,
 						stream ) ) != TT_Err_Ok )
       goto Fail3;
diff --git a/pango/opentype/ftxgsub.c b/pango/opentype/ftxgsub.c
index 6cdf3bd6..7cf5acb2 100644
--- a/pango/opentype/ftxgsub.c
+++ b/pango/opentype/ftxgsub.c
@@ -3007,13 +3007,14 @@
     lookahead_offset = GET_UShort();
 
     /* `ChainSubClassSetCount' is the upper limit for input class values,
-       thus we read it now to make an additional safety check.            */
+       thus we read it now to make an additional safety check. No limit
+       is known or needed for the other two class definitions          */
 
     count = ccsf2->ChainSubClassSetCount = GET_UShort();
 
     FORGET_Frame();
 
-    if ( ( error = Load_EmptyOrClassDefinition( &ccsf2->BacktrackClassDef, count,
+    if ( ( error = Load_EmptyOrClassDefinition( &ccsf2->BacktrackClassDef, 65535,
                                                 backtrack_offset, base_offset,
 					        stream ) ) != TT_Err_Ok )
         goto Fail5;
@@ -3022,7 +3023,7 @@
                                                 input_offset, base_offset,
                                                 stream ) ) != TT_Err_Ok )
         goto Fail4;
-    if ( ( error = Load_EmptyOrClassDefinition( &ccsf2->LookaheadClassDef, count,
+    if ( ( error = Load_EmptyOrClassDefinition( &ccsf2->LookaheadClassDef, 65535,
                                                 lookahead_offset, base_offset,
                                                 stream ) ) != TT_Err_Ok )
       goto Fail3;