shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

Better handling of start of `eexec' section.
This fixes Savannah bug #28090.

* src/type1/t1parse.c (T1_Get_Private_Dict): Skip all whitespace
characters before start of `eexec' section.

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

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,11 @@

+2009-11-25  John Tytgat  <[email protected]>

+

+	Better handling of start of `eexec' section.

+	This fixes Savannah bug #28090.

+

+	* src/type1/t1parse.c (T1_Get_Private_Dict): Skip all whitespace

+	characters before start of `eexec' section.

+

 2009-11-20  Werner Lemberg  <[email protected]>

 	Fix Savannah bug #27742.

--- a/src/type1/t1parse.c

+++ b/src/type1/t1parse.c

@@ -397,15 +397,18 @@

       T1_Skip_PS_Token( parser );

       cur = parser->root.cursor;

-      if ( *cur == '\r' )

-      {

-        cur++;

-        if ( *cur == '\n' )

-          cur++;

-      }

-      else if ( *cur == '\n' )

-        cur++;

-      else

+

+      /* according to the Type1 spec, the first cipher byte must not be  */

+      /* an ASCII whitespace character code (blank, tab, carriage return */

+      /* or line feed).  We have seen Type 1 fonts with two line feed    */

+      /* characters...  So skip now all whitespace character codes.      */

+      while ( cur < limit       &&

+              ( *cur == ' '  ||

+                *cur == '\t' || 

+                *cur == '\r' ||

+                *cur == '\n' ) )

+        ++cur;

+      if ( cur >= limit )

       {

         FT_ERROR(( "T1_Get_Private_Dict:"

                    " `eexec' not properly terminated\n" ));