You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2019/11/23 04:54:18 UTC

svn commit: r1870202 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator: DrawObject.java graphics/DrawObject.java markedcontent/DrawObject.java

Author: tilman
Date: Sat Nov 23 04:54:18 2019
New Revision: 1870202

URL: http://svn.apache.org/viewvc?rev=1870202&view=rev
Log:
PDFBOX-4666: remove stack overflow detection because of false positives: identical resources object used for page and widget annotations appearance triggers detection when acroform is flattened (e.g. file OpenOfficeForm.pdf)

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/DrawObject.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/DrawObject.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/DrawObject.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/DrawObject.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/DrawObject.java?rev=1870202&r1=1870201&r2=1870202&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/DrawObject.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/DrawObject.java Sat Nov 23 04:54:18 2019
@@ -64,12 +64,6 @@ public class DrawObject extends Operator
         {
             PDFormXObject form = (PDFormXObject) xobject;
             PDResources formResources = form.getResources();
-            if (formResources != null &&
-                context.getResources().getCOSObject() == formResources.getCOSObject())
-            {
-                LOG.error("avoiding recursion with XObject '" + name.getName() + "'");
-                return;
-            }
             if (form instanceof PDTransparencyGroup)
             {
                 context.showTransparencyGroup((PDTransparencyGroup) form);

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/DrawObject.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/DrawObject.java?rev=1870202&r1=1870201&r2=1870202&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/DrawObject.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/DrawObject.java Sat Nov 23 04:54:18 2019
@@ -71,15 +71,6 @@ public final class DrawObject extends Gr
         {
             PDFormXObject form = (PDFormXObject) xobject;
             PDResources formResources = form.getResources();
-            if (formResources != null &&
-                context.getResources().getCOSObject() == formResources.getCOSObject())
-            {
-                //TODO a general solution should be found for recursions that go over several levels
-                // context is a PDFStreamEngine and this is the same object on every level.
-                LOG.error("avoiding recursion with XObject '" + objectName.getName() + "'");
-                return;
-            }
-
             if (form instanceof PDTransparencyGroup)
             {
                 context.showTransparencyGroup((PDTransparencyGroup) form);

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/DrawObject.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/DrawObject.java?rev=1870202&r1=1870201&r2=1870202&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/DrawObject.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/DrawObject.java Sat Nov 23 04:54:18 2019
@@ -63,12 +63,6 @@ public class DrawObject extends Operator
         {
             PDFormXObject form = (PDFormXObject) xobject;
             PDResources formResources = form.getResources();
-            if (formResources != null && 
-                context.getResources().getCOSObject() == formResources.getCOSObject())
-            {
-                LOG.error("avoiding recursion with XObject '" + name.getName() + "'");
-                return;
-            }
             if (form instanceof PDTransparencyGroup)
             {
                 context.showTransparencyGroup((PDTransparencyGroup) form);