Merge pull request #17233 from calixteman/issue17232

Don't try to collect a nonexistent field because of an invalid ref
mozilla · Nov 7, 2023 · c6a717f · c6a717f
2 parents 72338ce + acc62f8
commit c6a717f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/src/core/document.js b/src/core/document.js
@@ -1713,6 +1713,9 @@ class PDFDocument {
 
   #collectFieldObjects(name, fieldRef, promises, annotationGlobals) {
     const field = this.xref.fetchIfRef(fieldRef);
+    if (!(field instanceof Dict)) {
+      return;
+    }
     if (field.has("T")) {
       const partName = stringToPDFString(field.get("T"));
       name = name === "" ? partName : `${name}.${partName}`;
@@ -1737,8 +1740,9 @@ class PDFDocument {
         })
     );
 
-    if (field.has("Kids")) {
-      for (const kid of field.get("Kids")) {
+    const kids = field.get("Kids");
+    if (Array.isArray(kids)) {
+      for (const kid of kids) {
         this.#collectFieldObjects(name, kid, promises, annotationGlobals);
       }
     }

diff --git a/test/pdfs/issue17232.pdf.link b/test/pdfs/issue17232.pdf.link
@@ -0,0 +1,2 @@
+https://github.com/mozilla/pdf.js/files/13280636/aanvraag-beeindiging-aansluiting.pdf
+
diff --git a/test/test_manifest.json b/test/test_manifest.json
@@ -8197,5 +8197,14 @@
       "rounds": 1,
       "type": "eq",
       "annotations": true
-   }   
+   },
+   {
+      "id": "issue17232-annotations",
+      "file": "pdfs/issue17232.pdf",
+      "md5": "90ade9fc5721ddf8d17e8cfc43e186a4",
+      "rounds": 1,
+      "link": true,
+      "type": "eq",
+      "annotations": true
+   }
 ]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		https://github.com/mozilla/pdf.js/files/13280636/aanvraag-beeindiging-aansluiting.pdf