Add stream property into resources if it contains indirect references

DEVSIX-7387

Author: vitali-pr

kernel/src/main/java/com/itextpdf/kernel/pdf/PdfObject.java

@@ -182,6 +182,35 @@ public PdfIndirectReference getIndirectReference() {
         return indirectReference;
     }
 
+    /**
+     * Checks recursively whether the object contains indirect reference at any level.
+     *
+     * @return {@code true} if indirect reference was found, {@code false} otherwise
+     */
+    public boolean containsIndirectReference() {
+        if (isIndirect()) {
+            return true;
+        }
+
+        if (isDictionary()) {
+            PdfDictionary dict = (PdfDictionary) this;
+            for (PdfObject value : dict.values()) {
+                if (value.containsIndirectReference()) {
+                    return true;
+                }
+            }
+        } else if (isArray()) {
+            PdfArray arr = (PdfArray) this;
+            for (PdfObject value : arr) {
+                if (value.containsIndirectReference()) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
     /**
      * Checks if object is indirect.
      * <br>

kernel/src/main/java/com/itextpdf/kernel/pdf/canvas/PdfCanvas.java

@@ -2171,11 +2171,12 @@ public PdfCanvas beginMarkedContent(PdfName tag, PdfDictionary properties) {
         PdfOutputStream out = contentStream.getOutputStream().write(tag).writeSpace();
         if (properties == null) {
             out.writeBytes(BMC);
-        } else if (properties.getIndirectReference() == null) {
-            out.write(properties).writeSpace().writeBytes(BDC);
-        } else {
+        } else if (properties.containsIndirectReference()) {
             out.write(resources.addProperties(properties)).writeSpace().writeBytes(BDC);
+        } else {
+            out.write(properties).writeSpace().writeBytes(BDC);
         }
+
         final Tuple2<PdfName, PdfDictionary> tuple2 = new Tuple2<>(tag, properties);
         if (this.drawingOnPage){
             document.checkIsoConformance(new CanvasBmcValidationContext(tagStructureStack, tuple2));

kernel/src/test/java/com/itextpdf/kernel/pdf/PdfObjectTest.java

@@ -260,6 +260,88 @@ public void pdtIndirectReferenceLateInitializing3() {
         document.close();
     }
 
+    @Test
+    public void containsIndirectReference1Test() {
+        PdfDocument pdfDoc = new PdfDocument(new PdfWriter(new ByteArrayOutputStream()));
+        PdfDictionary testDict = getTestPdfDictionary();
+        Assertions.assertFalse(testDict.containsIndirectReference());
+
+        testDict.get(new PdfName("b")).makeIndirect(pdfDoc);
+        Assertions.assertTrue(testDict.containsIndirectReference());
+    }
+
+    @Test
+    public void containsIndirectReference2Test() {
+        PdfDocument pdfDoc = new PdfDocument(new PdfWriter(new ByteArrayOutputStream()));
+        PdfDictionary testDict = getTestPdfDictionary();
+        PdfObject arrValue = new PdfName("arrValue");
+        PdfArray pdfArr = new PdfArray();
+        pdfArr.add(arrValue);
+
+        testDict.put(new PdfName("array"), pdfArr);
+        Assertions.assertFalse(testDict.containsIndirectReference());
+
+        arrValue.makeIndirect(pdfDoc);
+        Assertions.assertTrue(testDict.containsIndirectReference());
+    }
+
+    @Test
+    public void containsIndirectReferenceFlushedDictValueTest() {
+        PdfDocument pdfDoc = new PdfDocument(new PdfWriter(new ByteArrayOutputStream()));
+        PdfDictionary testDict = getTestPdfDictionary();
+        Assertions.assertFalse(testDict.containsIndirectReference());
+
+        testDict.get(new PdfName("b")).makeIndirect(pdfDoc).flush();
+        Assertions.assertTrue(testDict.containsIndirectReference());
+    }
+
+    @Test
+    public void containsIndirectReferenceFlushedArrayTest() {
+        PdfDocument pdfDoc = new PdfDocument(new PdfWriter(new ByteArrayOutputStream()));
+        PdfDictionary testDict = getTestPdfDictionary();
+        PdfObject arrValue = new PdfName("arrValue");
+        PdfArray pdfArr = new PdfArray();
+        pdfArr.add(arrValue);
+        pdfArr.makeIndirect(pdfDoc);
+        pdfArr.flush();
+
+        testDict.put(new PdfName("array"), pdfArr);
+        Assertions.assertTrue(testDict.containsIndirectReference());
+    }
+
+    @Test
+    public void containsIndirectReferenceFlushedArrayValueTest() {
+        PdfDocument pdfDoc = new PdfDocument(new PdfWriter(new ByteArrayOutputStream()));
+        PdfDictionary testDict = getTestPdfDictionary();
+        PdfObject arrValue = new PdfName("arrValue");
+        PdfArray pdfArr = new PdfArray();
+        pdfArr.add(arrValue);
+
+        arrValue.makeIndirect(pdfDoc);
+        arrValue.flush();
+
+        testDict.put(new PdfName("array"), pdfArr);
+        Assertions.assertTrue(testDict.containsIndirectReference());
+    }
+
+    @Test
+    public void containsIndirectReferenceFlushedArrayAndArrayValueTest() {
+        PdfDocument pdfDoc = new PdfDocument(new PdfWriter(new ByteArrayOutputStream()));
+        PdfDictionary testDict = getTestPdfDictionary();
+        PdfObject arrValue = new PdfName("arrValue");
+        PdfArray pdfArr = new PdfArray();
+        pdfArr.add(arrValue);
+
+        arrValue.makeIndirect(pdfDoc);
+        arrValue.flush();
+
+        pdfArr.makeIndirect(pdfDoc);
+        pdfArr.flush();
+
+        testDict.put(new PdfName("array"), pdfArr);
+        Assertions.assertTrue(testDict.containsIndirectReference());
+    }
+
     private static PdfDictionary getTestPdfDictionary() {
         HashMap<PdfName, PdfObject> tmpMap = new HashMap<PdfName, PdfObject>();
         tmpMap.put(new PdfName("b"), new PdfName("c"));