shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

Fix Savannah bug #43540.

* src/base/ftmac.c (parse_fond): Prevent a buffer overrun
caused by a font including too many (> 63) strings to store
names[] table.

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,5 +1,13 @@

 2014-11-26  suzuki toshiya  <[email protected]>

+	Fix Savannah bug #43540.

+

+	* src/base/ftmac.c (parse_fond): Prevent a buffer overrun

+	caused by a font including too many (> 63) strings to store

+	names[] table.

+

+2014-11-26  suzuki toshiya  <[email protected]>

+

 	* src/base/ftobjs.c (Mac_Read_POST_Resource): Use unsigned long

 	variables to read the lengths in POST fragments.  Suggested by

 	Mateusz Jurczyk <[email protected]>.

--- a/src/base/ftmac.c

+++ b/src/base/ftmac.c

@@ -440,9 +440,10 @@

       style = (StyleTable*)p;

       p += sizeof ( StyleTable );

       string_count = EndianS16_BtoN( *(short*)(p) );

+      string_count = FT_MIN( 64, string_count );

       p += sizeof ( short );

-      for ( i = 0; i < string_count && i < 64; i++ )

+      for ( i = 0; i < string_count; i++ )

       {

         names[i] = p;

         p       += names[i][0];

@@ -459,7 +460,7 @@

           ps_name[ps_name_len] = 0;

         }

         if ( style->indexes[face_index] > 1 &&

-             style->indexes[face_index] <= FT_MIN( string_count, 64 ) )

+             style->indexes[face_index] <= string_count )

         {

           unsigned char*  suffixes = names[style->indexes[face_index] - 1];