* src/type1/t1load.c (parse_charstrings): Catch this non-standard

20 years ago · e9b8c39eb8
parent a9a65f7f50
commit e9b8c39eb8
2 changed files with 23 additions and 1 deletions
--- a/9
+++ b/9
@ -1,3 +1,12 @@
+2005-04-14  Werner Lemberg  <wl@gnu.org>
+
+	* src/type1/t1load.c (parse_charstrings): Catch this non-standard
+	beginning of the /CharStrings dictionary:
+
+	  /CharStrings 118 dict def
+	  Private begin
+	  CharStrings begin
+
 2005-04-13  Werner Lemberg  <wl@gnu.org>

 	* docs/TODO: Updated.
--- a/src/type1/t1load.c
+++ b/src/type1/t1load.c
@ -1448,7 +1448,20 @@
        if ( cur[0] == 'd' &&
             cur[1] == 'e' &&
             cur[2] == 'f' )
-          break;
+        {
+          /* There are fonts which have this: */
+          /*                                  */
+          /*   /CharStrings 118 dict def      */
+          /*   Private begin                  */
+          /*   CharStrings begin              */
+          /*   ...                            */
+          /*                                  */
+          /* To catch this we ignore `def' if */
+          /* no charstring has actually been  */
+          /* seen.                            */
+          if ( n )
+            break;
+        }

        if ( cur[0] == 'e' &&
             cur[1] == 'n' &&