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/10/10 06:31:54 UTC
svn commit: r1868220 - in
/pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator:
DrawObject.java graphics/DrawObject.java markedcontent/DrawObject.java
Author: tilman
Date: Thu Oct 10 06:31:53 2019
New Revision: 1868220
URL: http://svn.apache.org/viewvc?rev=1868220&view=rev
Log:
PDFBOX-4666: avoid stackoverflow
Modified:
pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/DrawObject.java
pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/DrawObject.java
pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/DrawObject.java
Modified: pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/DrawObject.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/DrawObject.java?rev=1868220&r1=1868219&r2=1868220&view=diff
==============================================================================
--- pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/DrawObject.java (original)
+++ pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/DrawObject.java Thu Oct 10 06:31:53 2019
@@ -16,14 +16,17 @@
*/
package org.apache.pdfbox.contentstream.operator;
+import java.io.IOException;
+import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.graphics.PDXObject;
import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
import org.apache.pdfbox.pdmodel.graphics.form.PDTransparencyGroup;
-
-import java.io.IOException;
-import java.util.List;
+import org.apache.pdfbox.pdmodel.PDResources;
/**
* Do: Draws an XObject.
@@ -33,10 +36,12 @@ import java.util.List;
*/
public class DrawObject extends OperatorProcessor
{
+ private static final Log LOG = LogFactory.getLog(DrawObject.class);
+
@Override
public void process(Operator operator, List<COSBase> arguments) throws IOException
{
- if (arguments.size() < 1)
+ if (arguments.isEmpty())
{
throw new MissingOperandException(operator, arguments);
}
@@ -55,14 +60,24 @@ public class DrawObject extends Operator
PDXObject xobject = context.getResources().getXObject(name);
- if (xobject instanceof PDTransparencyGroup)
- {
- context.showTransparencyGroup((PDTransparencyGroup) xobject);
- }
- else if (xobject instanceof PDFormXObject)
+ if (xobject instanceof PDFormXObject)
{
PDFormXObject form = (PDFormXObject) xobject;
- context.showForm(form);
+ 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);
+ }
+ else
+ {
+ context.showForm(form);
+ }
}
}
Modified: pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/DrawObject.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/DrawObject.java?rev=1868220&r1=1868219&r2=1868220&view=diff
==============================================================================
--- pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/DrawObject.java (original)
+++ pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/DrawObject.java Thu Oct 10 06:31:53 2019
@@ -18,8 +18,10 @@ package org.apache.pdfbox.contentstream.
import java.io.IOException;
import java.util.List;
-import org.apache.pdfbox.contentstream.operator.MissingOperandException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.contentstream.operator.MissingOperandException;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.MissingResourceException;
@@ -28,6 +30,7 @@ import org.apache.pdfbox.pdmodel.graphic
import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
import org.apache.pdfbox.pdmodel.graphics.PDXObject;
import org.apache.pdfbox.contentstream.operator.Operator;
+import org.apache.pdfbox.pdmodel.PDResources;
/**
* Do: Draws an XObject.
@@ -37,10 +40,12 @@ import org.apache.pdfbox.contentstream.o
*/
public final class DrawObject extends GraphicsOperatorProcessor
{
+ private static final Log LOG = LogFactory.getLog(DrawObject.class);
+
@Override
public void process(Operator operator, List<COSBase> operands) throws IOException
{
- if (operands.size() < 1)
+ if (operands.isEmpty())
{
throw new MissingOperandException(operator, operands);
}
@@ -61,13 +66,25 @@ public final class DrawObject extends Gr
PDImageXObject image = (PDImageXObject)xobject;
context.drawImage(image);
}
- else if (xobject instanceof PDTransparencyGroup)
- {
- getContext().showTransparencyGroup((PDTransparencyGroup) xobject);
- }
else if (xobject instanceof PDFormXObject)
{
- getContext().showForm((PDFormXObject) xobject);
+ PDFormXObject form = (PDFormXObject) xobject;
+ PDResources formResources = form.getResources();
+ if (formResources != null &&
+ context.getResources().getCOSObject() == formResources.getCOSObject())
+ {
+ LOG.error("avoiding recursion with XObject '" + objectName.getName() + "'");
+ return;
+ }
+
+ if (form instanceof PDTransparencyGroup)
+ {
+ context.showTransparencyGroup((PDTransparencyGroup) form);
+ }
+ else
+ {
+ context.showForm(form);
+ }
}
}
Modified: pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/DrawObject.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/DrawObject.java?rev=1868220&r1=1868219&r2=1868220&view=diff
==============================================================================
--- pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/DrawObject.java (original)
+++ pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/DrawObject.java Thu Oct 10 06:31:53 2019
@@ -16,19 +16,22 @@
*/
package org.apache.pdfbox.contentstream.operator.markedcontent;
+import java.io.IOException;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.contentstream.operator.MissingOperandException;
+import org.apache.pdfbox.contentstream.operator.Operator;
+import org.apache.pdfbox.contentstream.operator.OperatorProcessor;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSName;
+import org.apache.pdfbox.pdmodel.PDResources;
import org.apache.pdfbox.pdmodel.graphics.PDXObject;
import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
import org.apache.pdfbox.pdmodel.graphics.form.PDTransparencyGroup;
import org.apache.pdfbox.text.PDFMarkedContentExtractor;
-import java.io.IOException;
-import java.util.List;
-import org.apache.pdfbox.contentstream.operator.MissingOperandException;
-import org.apache.pdfbox.contentstream.operator.Operator;
-import org.apache.pdfbox.contentstream.operator.OperatorProcessor;
-
/**
* Do: Draws an XObject.
*
@@ -37,10 +40,12 @@ import org.apache.pdfbox.contentstream.o
*/
public class DrawObject extends OperatorProcessor
{
+ private static final Log LOG = LogFactory.getLog(DrawObject.class);
+
@Override
public void process(Operator operator, List<COSBase> arguments) throws IOException
{
- if (arguments.size() < 1)
+ if (arguments.isEmpty())
{
throw new MissingOperandException(operator, arguments);
}
@@ -50,17 +55,27 @@ public class DrawObject extends Operator
return;
}
COSName name = (COSName) base0;
- PDXObject xobject = context.getResources().getXObject(name);
+ PDXObject xobject = context.getResources().getXObject(name);
((PDFMarkedContentExtractor) context).xobject(xobject);
- if (xobject instanceof PDTransparencyGroup)
- {
- context.showTransparencyGroup((PDTransparencyGroup) xobject);
- }
- else if (xobject instanceof PDFormXObject)
+ if (xobject instanceof PDFormXObject)
{
PDFormXObject form = (PDFormXObject) xobject;
- context.showForm(form);
+ 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);
+ }
+ else
+ {
+ context.showForm(form);
+ }
}
}