Merge pull request #17690 from calixteman/issue17689

Avoid to access to a missing cidSystemInfo property
mozilla · Feb 19, 2024 · 99fa713 · 99fa713
2 parents d96fd80 + a6eadf8
commit 99fa713
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/src/core/evaluator.js b/src/core/evaluator.js
@@ -3719,7 +3719,9 @@ class PartialEvaluator {
       properties.composite &&
       ((properties.cMap.builtInCMap &&
         !(properties.cMap instanceof IdentityCMap)) ||
-        (properties.cidSystemInfo.registry === "Adobe" &&
+        // The font is supposed to have a CIDSystemInfo dictionary, but some
+        // PDFs don't include it (fixes issue 17689), hence the `?'.
+        (properties.cidSystemInfo?.registry === "Adobe" &&
           (properties.cidSystemInfo.ordering === "GB1" ||
             properties.cidSystemInfo.ordering === "CNS1" ||
             properties.cidSystemInfo.ordering === "Japan1" ||

diff --git a/test/pdfs/issue17689.pdf.link b/test/pdfs/issue17689.pdf.link
@@ -0,0 +1,2 @@
+https://github.com/mozilla/pdf.js/files/14328616/2023_12_13.pdf
+
diff --git a/test/test_manifest.json b/test/test_manifest.json
@@ -9736,5 +9736,15 @@
     "md5": "407695b36b4611bc7c501a891c8a4b28",
     "rounds": 1,
     "type": "eq"
+  },
+  {
+    "id": "issue17689",
+    "file": "pdfs/issue17689.pdf",
+    "md5": "2d260d3795e551fa047eef7c3dbab45b",
+    "rounds": 1,
+    "link": true,
+    "firstPage": 2,
+    "lastPage": 2,
+    "type": "eq"
   }
 ]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		https://github.com/mozilla/pdf.js/files/14328616/2023_12_13.pdf