Merge pull request #12450 from janpe2/cff-xuid

timvandermeij · web-flow · commit 7ae3e13f16a4 · 2020-10-05T22:54:39.000+02:00
Fix invalid `XUID` entries in CFF fonts
diff --git a/src/core/cff_parser.js b/src/core/cff_parser.js
@@ -1407,6 +1407,12 @@ class CFFCompiler {
       }
     }
 
+    const xuid = cff.topDict.getByName("XUID");
+    if (xuid && xuid.length > 16) {
+      // Length of XUID array must not be greater than 16 (issue #12399).
+      cff.topDict.removeByName("XUID");
+    }
+
     cff.topDict.setByName("charset", 0);
     var compiled = this.compileTopDicts(
       [cff.topDict],
diff --git a/test/pdfs/.gitignore b/test/pdfs/.gitignore
@@ -169,6 +169,7 @@
 !issue5202.pdf
 !images_1bit_grayscale.pdf
 !issue5280.pdf
+!issue12399_reduced.pdf
 !issue5677.pdf
 !issue5954.pdf
 !issue6612.pdf
diff --git a/test/pdfs/issue12399_reduced.pdf b/test/pdfs/issue12399_reduced.pdf
diff --git a/test/test_manifest.json b/test/test_manifest.json
@@ -1914,6 +1914,12 @@
        "type": "eq",
        "about": "Please note that this file currently renders incorrectly."
     },
+    {  "id": "issue12399",
+       "file": "pdfs/issue12399_reduced.pdf",
+       "md5": "01bdd258be93e10f8399708eecedbfd6",
+       "rounds": 1,
+       "type": "eq"
+    },
     {  "id": "issue5808-text",
        "file": "pdfs/issue5808.pdf",
        "md5": "e0584dd540d7859d6c191aa53379692e",

Original file line number	Diff line number	Diff line change
`@@ -1407,6 +1407,12 @@ class CFFCompiler {`
`1407`	`1407`	`}`
`1408`	`1408`	`}`
`1409`	`1409`
	`1410`	`+ const xuid = cff.topDict.getByName("XUID");`
	`1411`	`+ if (xuid && xuid.length > 16) {`
	`1412`	`+ // Length of XUID array must not be greater than 16 (issue #12399).`
	`1413`	`+ cff.topDict.removeByName("XUID");`
	`1414`	`+ }`
	`1415`	`+`
`1410`	`1416`	`cff.topDict.setByName("charset", 0);`
`1411`	`1417`	`var compiled = this.compileTopDicts(`
`1412`	`1418`	`[cff.topDict],`