sfnt: Extend TT_BDF->strings_size to FT_ULong for huge BDF.

16 years ago · 13cdd027d2
parent a0f7778bd4
commit 13cdd027d2
3 changed files with 14 additions and 2 deletions
--- a/12
+++ b/12
@ -1,3 +1,15 @@
+2009-07-03  suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+
+	sfnt: Extend TT_BDF->strings_size to FT_ULong for huge BDF.
+
+	* include/freetype/internal/tttypes.h: The type
+	of TT_BDF->string_size is extended from FT_UInt32
+	to FT_ULong, because BDF specification does not 
+	restrict the length of string.
+	* src/sfnt/ttbdf.c: The scratch variable `strings'
+	to load TT_BDF->string_size is matched with
+	TT_BDF->string_size.
+
 2009-07-03  suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>

 	psaux: Handle the string length by FT_Offset variables.
--- a/include/freetype/internal/tttypes.h
+++ b/include/freetype/internal/tttypes.h
@ -902,7 +902,7 @@ FT_BEGIN_HEADER
    FT_Byte*   table;
    FT_Byte*   table_end;
    FT_Byte*   strings;
-    FT_UInt32  strings_size;
+    FT_ULong   strings_size;
    FT_UInt    num_strikes;
    FT_Bool    loaded;

--- a/src/sfnt/ttbdf.c
+++ b/src/sfnt/ttbdf.c
@ -84,7 +84,7 @@
      FT_Byte*   p           = bdf->table;
      FT_UInt    version     = FT_NEXT_USHORT( p );
      FT_UInt    num_strikes = FT_NEXT_USHORT( p );
-      FT_UInt32  strings     = FT_NEXT_ULONG ( p );
+      FT_ULong   strings     = FT_NEXT_ULONG ( p );
      FT_UInt    count;
      FT_Byte*   strike;