Merge pull request #21176 from calixteman/bug2035197

Fix merging PDFs with conflicting AcroForm /DR (bug 2035197)

Author: calixteman

src/core/editor/pdf_editor.js

@@ -2000,7 +2000,7 @@ class PDFEditor {
     const resourcesValuesCache = new Map();
     for (const field of drToFix) {
       const ap = field.get("AP");
-      for (const value of ap.getValues()) {
+      for (const [, value] of ap) {
         if (!(value instanceof BaseStream)) {
           continue;
         }

test/pdfs/.gitignore

@@ -906,3 +906,5 @@
 !issue13520.pdf
 !22060_A1_01_Plans.pdf
 !issue21126.pdf
+!bug2035197_1.pdf
+!bug2035197_2.pdf

test/pdfs/bug2035197_1.pdf

@@ -6586,6 +6586,29 @@ small scripts as well as for`);
 
         await loadingTask.destroy();
       });
+
+      it("merges PDFs with conflicting AcroForm /DR (bug 2035197)", async function () {
+        // Two PDFs with different `AcroForm.DR`.
+        const loadingTask = getDocument(
+          buildGetDocumentParams("bug2035197_1.pdf")
+        );
+        const pdfDoc = await loadingTask.promise;
+        const pdfData2 = await DefaultFileReaderFactory.fetch({
+          path: TEST_PDFS_PATH + "bug2035197_2.pdf",
+        });
+
+        const data = await pdfDoc.extractPages([
+          { document: null },
+          { document: pdfData2 },
+        ]);
+        expect(data).not.toBeNull();
+        await loadingTask.destroy();
+
+        const newLoadingTask = getDocument(data);
+        const newPdfDoc = await newLoadingTask.promise;
+        expect(newPdfDoc.numPages).toEqual(2);
+        await newLoadingTask.destroy();
+      });
     });
 
     describe("Outlines", function () {