Merge pull request #15013 from Snuffleupagus/issue-15012

Render PopupAnnotations even if they have missing or empty /Rect-entries (issue 15012, PR 14439 follow-up)
mozilla · Jun 9, 2022 · 1eaef66 · 1eaef66
2 parents a1bc5a8 + 6371a76
commit 1eaef66
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
         run: npm install -g gulp-cli
 
       - name: Install other dependencies
-        run: npm install
+        run: npm install -f
 
       - name: Run tests
         run: gulp ci-test
diff --git a/src/display/annotation_layer.js b/src/display/annotation_layer.js
@@ -2410,14 +2410,14 @@ class AnnotationLayer {
       if (!data) {
         continue;
       }
-      const { width, height } = getRectDims(data.rect);
-      if (width <= 0 || height <= 0) {
-        continue;
-      }
       if (data.annotationType === AnnotationType.POPUP) {
         popupAnnotations.push(data);
         continue;
       }
+      const { width, height } = getRectDims(data.rect);
+      if (width <= 0 || height <= 0) {
+        continue; // Ignore empty annotations.
+      }
       sortedAnnotations.push(data);
     }
     if (popupAnnotations.length) {

diff --git a/test/pdfs/.gitignore b/test/pdfs/.gitignore
@@ -507,6 +507,7 @@
 !xfa_issue14315.pdf
 !poppler-67295-0.pdf
 !poppler-85140-0.pdf
+!issue15012.pdf
 !poppler-395-0-fuzzed.pdf
 !GHOSTSCRIPT-698804-1-fuzzed.pdf
 !issue14814.pdf

diff --git a/test/pdfs/issue15012.pdf b/test/pdfs/issue15012.pdf
diff --git a/test/test_manifest.json b/test/test_manifest.json
@@ -4951,6 +4951,13 @@
        "type": "eq",
        "forms": true
     },
+    {  "id": "issue15012",
+       "file": "pdfs/issue15012.pdf",
+       "md5": "cc5e89507262cb3ec6862f68cb3eefd1",
+       "rounds": 1,
+       "type": "eq",
+       "annotations": true
+    },
     {  "id": "gesamt",
       "file": "pdfs/gesamt.pdf",
       "md5": "743aaa6f46ed0a42864f079d632d942e",