Merge pull request #12516 from Snuffleupagus/fieldObjects-annotation-…

…undefined Prevent issues, in `PDFDocument.fieldObjects`, for invalid Annotations
mozilla · Oct 24, 2020 · c493dc9 · c493dc9
2 parents 1eaf9c9 + b44a975
commit c493dc9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/core/document.js b/src/core/document.js
@@ -969,7 +969,7 @@ class PDFDocument {
         this.pdfManager,
         this._localIdFactory
       )
-        .then(annotation => annotation.getFieldObject())
+        .then(annotation => annotation && annotation.getFieldObject())
         .catch(function (reason) {
           warn(`_collectFieldObjects: "${reason}".`);
           return null;
@@ -999,7 +999,7 @@ class PDFDocument {
     for (const [name, promises] of fieldPromises) {
       allPromises.push(
         Promise.all(promises).then(fields => {
-          fields = fields.filter(field => field !== null);
+          fields = fields.filter(field => !!field);
           if (fields.length > 0) {
             allFields[name] = fields;
           }