Merge pull request #17395 from Snuffleupagus/pypdf-2332

Support Annotations with corrupt /BS-entries
mozilla · Dec 9, 2023 · 988d3a1 · 988d3a1
2 parents d6b9e62 + a1d859c
commit 988d3a1
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/src/core/annotation.js b/src/core/annotation.js
@@ -999,12 +999,15 @@ class Annotation {
     }
     if (borderStyle.has("BS")) {
       const dict = borderStyle.get("BS");
-      const dictType = dict.get("Type");
 
-      if (!dictType || isName(dictType, "Border")) {
-        this.borderStyle.setWidth(dict.get("W"), this.rectangle);
-        this.borderStyle.setStyle(dict.get("S"));
-        this.borderStyle.setDashArray(dict.getArray("D"));
+      if (dict instanceof Dict) {
+        const dictType = dict.get("Type");
+
+        if (!dictType || isName(dictType, "Border")) {
+          this.borderStyle.setWidth(dict.get("W"), this.rectangle);
+          this.borderStyle.setStyle(dict.get("S"));
+          this.borderStyle.setDashArray(dict.getArray("D"));
+        }
       }
     } else if (borderStyle.has("Border")) {
       const array = borderStyle.getArray("Border");

diff --git a/test/pdfs/pypdf2332.pdf.link b/test/pdfs/pypdf2332.pdf.link
@@ -0,0 +1 @@
+https://github.com/py-pdf/pypdf/files/13606678/output.pdf
diff --git a/test/test_manifest.json b/test/test_manifest.json
@@ -4902,6 +4902,15 @@
        "rounds": 1,
        "type": "eq"
     },
+    {  "id": "pypdf2332",
+       "file": "pdfs/pypdf2332.pdf",
+       "md5": "883d2cf4d0ed16e32c917498fe9843dd",
+       "rounds": 1,
+       "link": true,
+       "lastPage": 1,
+       "type": "eq",
+       "annotations": true
+    },
     {  "id": "issue6151",
        "file": "pdfs/issue6151.pdf",
        "md5": "926f8c6b25e6f0978759f7947d70e079",

diff --git a/test/unit/annotation_spec.js b/test/unit/annotation_spec.js
@@ -35,7 +35,6 @@ import {
 import {
   CMAP_URL,
   createIdFactory,
-  getNodeVersion,
   STANDARD_FONT_DATA_URL,
   XRefMock,
 } from "./test_utils.js";
@@ -2209,10 +2208,9 @@ describe("annotation", function () {
     });
 
     it("should compress and save text", async function () {
-      if (isNodeJS && getNodeVersion().major >= 20) {
+      if (isNodeJS) {
         pending(
-          "CompressionStream behaves differently in Node.js >= 20, " +
-            "compared to Firefox, Chrome, and Node.js 18."
+          "CompressionStream behaves differently in Node.js, compared to Firefox and Chrome."
         );
       }
       const textWidgetRef = Ref.get(123, 0);

diff --git a/test/unit/test_utils.js b/test/unit/test_utils.js
@@ -144,22 +144,11 @@ function createIdFactory(pageIndex) {
   return page._localIdFactory;
 }
 
-function getNodeVersion() {
-  if (!isNodeJS) {
-    throw new Error("getNodeVersion - only valid in Node.js environments.");
-  }
-  const [major, minor, patch] = process.versions.node
-    .split(".")
-    .map(parseFloat);
-  return { major, minor, patch };
-}
-
 export {
   buildGetDocumentParams,
   CMAP_URL,
   createIdFactory,
   DefaultFileReaderFactory,
-  getNodeVersion,
   STANDARD_FONT_DATA_URL,
   TEST_PDFS_PATH,
   XRefMock,