Merge pull request #12824 from Snuffleupagus/preEvaluateFont-errors

Improve the handling of errors, in `PartialEvaluator.loadFont`, occuring in `PartialEvaluator.preEvaluateFont` (issue 12823)

src/core/evaluator.js

@@ -1062,7 +1062,13 @@ class PartialEvaluator {
 
     var fontCapability = createPromiseCapability();
 
-    var preEvaluatedFont = this.preEvaluateFont(font);
+    let preEvaluatedFont;
+    try {
+      preEvaluatedFont = this.preEvaluateFont(font);
+    } catch (reason) {
+      warn(`loadFont - ignoring preEvaluateFont errors: "${reason}".`);
+      return errorFont();
+    }
     const { descriptor, hash } = preEvaluatedFont;
 
     var fontRefIsRef = isRef(fontRef),
@@ -3258,6 +3264,9 @@ class PartialEvaluator {
       }
       dict = Array.isArray(df) ? this.xref.fetchIfRef(df[0]) : df;
 
+      if (!(dict instanceof Dict)) {
+        throw new FormatError("Descendant font is not a dictionary.");
+      }
       type = dict.get("Subtype");
       if (!isName(type)) {
         throw new FormatError("invalid font Subtype");

test/pdfs/.gitignore

@@ -70,6 +70,7 @@
 !issue8570.pdf
 !issue8697.pdf
 !issue8702.pdf
+!issue12823.pdf
 !issue8707.pdf
 !issue8798r.pdf
 !issue8823.pdf

test/test_manifest.json

@@ -1163,6 +1163,12 @@
        "link": false,
        "type": "eq"
     },
+    {  "id": "issue12823",
+       "file": "pdfs/issue12823.pdf",
+       "md5": "8391c63006ccc4b41c95de5e8c38deeb",
+       "rounds": 1,
+       "type": "eq"
+    },
     {  "id": "bug1050040",
        "file": "pdfs/bug1050040.pdf",
        "md5": "9076b29bd157e2646b457f29a4472a07",