Handle NPE on CopyPagesTo

DEVSIX-6298
Kaotic3 · May 10, 2022 · 30c6c9e · 30c6c9e
1 parent 22b28c2
commit 30c6c9e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/forms/src/main/java/com/itextpdf/forms/PdfPageFormCopier.java b/forms/src/main/java/com/itextpdf/forms/PdfPageFormCopier.java
@@ -335,7 +335,8 @@ private void addChildToExistingParent(PdfDictionary fieldDic, Set<String> existi
             if (existingFields.contains(name)) {
                 PdfArray kids = parent.getAsArray(PdfName.Kids);
                 for (PdfObject kid : kids) {
-                    if (((PdfDictionary) kid).get(PdfName.T).equals(fieldDic.get(PdfName.T))) {
+                    if (((PdfDictionary) kid).get(PdfName.T) != null &&
+                            ((PdfDictionary) kid).get(PdfName.T).equals(fieldDic.get(PdfName.T))) {
                         PdfFormField kidField = makeFormField(kid);
                         PdfFormField field = makeFormField(fieldDic);
                         if (kidField == null || field == null) {

diff --git a/forms/src/test/java/com/itextpdf/forms/PdfFormCopyTest.java b/forms/src/test/java/com/itextpdf/forms/PdfFormCopyTest.java
@@ -696,4 +696,16 @@ public void mergeTwoWidgetsAndTwoWidgetsTest() throws IOException, InterruptedEx
 
         Assert.assertNull(new CompareTool().compareByContent(destFilename, cmpFileName, destinationFolder, "diff_"));
     }
+
+    @Test
+    public void widgetContainsNoTEntryTest() throws IOException, InterruptedException {
+        String sourceFileName = sourceFolder + "fieldThreeWidgets.pdf";
+        String destFileName = destinationFolder + "widgetContainsNoTEntryTest.pdf";
+        String cmpFileName = sourceFolder + "cmp_widgetContainsNoTEntryTest.pdf";
+        PdfDocument sourcePdfDocument = new PdfDocument(new PdfReader(sourceFileName));
+        PdfDocument resultPdfDocument = new PdfDocument(new PdfWriter(destFileName));
+        sourcePdfDocument.copyPagesTo(1, sourcePdfDocument.getNumberOfPages(), resultPdfDocument, new PdfPageFormCopier());
+        resultPdfDocument.close();
+        Assert.assertNull(new CompareTool().compareByContent(destFileName, cmpFileName, destinationFolder, "diff_"));
+    }
 }
diff --git a/.../src/test/resources/com/itextpdf/forms/PdfFormCopyTest/cmp_widgetContainsNoTEntryTest.pdf b/.../src/test/resources/com/itextpdf/forms/PdfFormCopyTest/cmp_widgetContainsNoTEntryTest.pdf
diff --git a/forms/src/test/resources/com/itextpdf/forms/PdfFormCopyTest/fieldThreeWidgets.pdf b/forms/src/test/resources/com/itextpdf/forms/PdfFormCopyTest/fieldThreeWidgets.pdf