From 087b7ea6674a29c4f86f5418be64621331eabfec Mon Sep 17 00:00:00 2001
From: John Tytgat <John.Tytgat@esko.com>
Date: Wed, 25 Nov 2009 23:51:06 +0100
Subject: [PATCH] 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.
---
 ChangeLog           |  8 ++++++++
 src/type1/t1parse.c | 21 ++++++++++++---------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d8c78d44..18d94eb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-25  John Tytgat  <John.Tytgat@esko.com>
+
+	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  <wl@gnu.org>
 
 	Fix Savannah bug #27742.
diff --git a/src/type1/t1parse.c b/src/type1/t1parse.c
index 1bef56bc..2a762279 100644
--- 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" ));