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 2015/11/20 21:21:22 UTC
svn commit: r1715409 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator:
graphics/ state/
Author: tilman
Date: Fri Nov 20 20:21:22 2015
New Revision: 1715409
URL: http://svn.apache.org/viewvc?rev=1715409&view=rev
Log:
PDFBOX-2852, PDFBOX-2982: avoid ClassCastException / ArrayOutOfBoundsExceptions
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/AppendRectangleToPath.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveTo.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateFinalPoint.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateInitialPoint.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/LineTo.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/MoveTo.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/ShadingFill.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetLineCapStyle.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetLineJoinStyle.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetLineMiterLimit.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetRenderingIntent.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/AppendRectangleToPath.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/AppendRectangleToPath.java?rev=1715409&r1=1715408&r2=1715409&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/AppendRectangleToPath.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/AppendRectangleToPath.java Fri Nov 20 20:21:22 2015
@@ -19,6 +19,7 @@ package org.apache.pdfbox.contentstream.
import java.awt.geom.Point2D;
import java.io.IOException;
import java.util.List;
+import org.apache.pdfbox.contentstream.operator.MissingOperandException;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSNumber;
@@ -34,6 +35,10 @@ public final class AppendRectangleToPath
@Override
public void process(Operator operator, List<COSBase> operands) throws IOException
{
+ if (operands.size() < 4)
+ {
+ throw new MissingOperandException(operator, operands);
+ }
COSNumber x = (COSNumber) operands.get(0);
COSNumber y = (COSNumber) operands.get(1);
COSNumber w = (COSNumber) operands.get(2);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveTo.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveTo.java?rev=1715409&r1=1715408&r2=1715409&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveTo.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveTo.java Fri Nov 20 20:21:22 2015
@@ -21,6 +21,7 @@ import java.util.List;
import java.awt.geom.Point2D;
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.COSNumber;
@@ -38,6 +39,10 @@ public class CurveTo extends GraphicsOpe
@Override
public void process(Operator operator, List<COSBase> operands) throws IOException
{
+ if (operands.size() < 6)
+ {
+ throw new MissingOperandException(operator, operands);
+ }
COSNumber x1 = (COSNumber)operands.get(0);
COSNumber y1 = (COSNumber)operands.get(1);
COSNumber x2 = (COSNumber)operands.get(2);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateFinalPoint.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateFinalPoint.java?rev=1715409&r1=1715408&r2=1715409&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateFinalPoint.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateFinalPoint.java Fri Nov 20 20:21:22 2015
@@ -19,6 +19,7 @@ package org.apache.pdfbox.contentstream.
import java.io.IOException;
import java.util.List;
import java.awt.geom.Point2D;
+import org.apache.pdfbox.contentstream.operator.MissingOperandException;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSNumber;
@@ -34,6 +35,10 @@ public final class CurveToReplicateFinal
@Override
public void process(Operator operator, List<COSBase> operands) throws IOException
{
+ if (operands.size() < 4)
+ {
+ throw new MissingOperandException(operator, operands);
+ }
COSNumber x1 = (COSNumber)operands.get(0);
COSNumber y1 = (COSNumber)operands.get(1);
COSNumber x3 = (COSNumber)operands.get(2);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateInitialPoint.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateInitialPoint.java?rev=1715409&r1=1715408&r2=1715409&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateInitialPoint.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateInitialPoint.java Fri Nov 20 20:21:22 2015
@@ -22,6 +22,7 @@ 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.cos.COSBase;
import org.apache.pdfbox.cos.COSNumber;
import org.apache.pdfbox.contentstream.operator.Operator;
@@ -38,6 +39,10 @@ public class CurveToReplicateInitialPoin
@Override
public void process(Operator operator, List<COSBase> operands) throws IOException
{
+ if (operands.size() < 4)
+ {
+ throw new MissingOperandException(operator, operands);
+ }
COSNumber x2 = (COSNumber)operands.get(0);
COSNumber y2 = (COSNumber)operands.get(1);
COSNumber x3 = (COSNumber)operands.get(2);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/LineTo.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/LineTo.java?rev=1715409&r1=1715408&r2=1715409&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/LineTo.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/LineTo.java Fri Nov 20 20:21:22 2015
@@ -22,6 +22,7 @@ import java.awt.geom.Point2D;
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.COSNumber;
import org.apache.pdfbox.contentstream.operator.Operator;
@@ -38,9 +39,23 @@ public class LineTo extends GraphicsOper
@Override
public void process(Operator operator, List<COSBase> operands) throws IOException
{
+ if (operands.size() < 2)
+ {
+ throw new MissingOperandException(operator, operands);
+ }
+ COSBase base0 = operands.get(0);
+ if (!(base0 instanceof COSNumber))
+ {
+ return;
+ }
+ COSBase base1 = operands.get(1);
+ if (!(base1 instanceof COSNumber))
+ {
+ return;
+ }
// append straight line segment from the current point to the point
- COSNumber x = (COSNumber)operands.get(0);
- COSNumber y = (COSNumber)operands.get(1);
+ COSNumber x = (COSNumber) base0;
+ COSNumber y = (COSNumber) base1;
Point2D.Float pos = context.transformedPoint(x.floatValue(), y.floatValue());
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/MoveTo.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/MoveTo.java?rev=1715409&r1=1715408&r2=1715409&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/MoveTo.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/MoveTo.java Fri Nov 20 20:21:22 2015
@@ -19,6 +19,7 @@ package org.apache.pdfbox.contentstream.
import java.awt.geom.Point2D;
import java.io.IOException;
import java.util.List;
+import org.apache.pdfbox.contentstream.operator.MissingOperandException;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSNumber;
@@ -34,8 +35,22 @@ public final class MoveTo extends Graphi
@Override
public void process(Operator operator, List<COSBase> operands) throws IOException
{
- COSNumber x = (COSNumber)operands.get(0);
- COSNumber y = (COSNumber)operands.get(1);
+ if (operands.size() < 2)
+ {
+ throw new MissingOperandException(operator, operands);
+ }
+ COSBase base0 = operands.get(0);
+ if (!(base0 instanceof COSNumber))
+ {
+ return;
+ }
+ COSBase base1 = operands.get(1);
+ if (!(base1 instanceof COSNumber))
+ {
+ return;
+ }
+ COSNumber x = (COSNumber) base0;
+ COSNumber y = (COSNumber) base1;
Point2D.Float pos = context.transformedPoint(x.floatValue(), y.floatValue());
context.moveTo(pos.x, pos.y);
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/ShadingFill.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/ShadingFill.java?rev=1715409&r1=1715408&r2=1715409&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/ShadingFill.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/ShadingFill.java Fri Nov 20 20:21:22 2015
@@ -19,6 +19,7 @@ package org.apache.pdfbox.contentstream.
import java.io.IOException;
import java.util.List;
+import org.apache.pdfbox.contentstream.operator.MissingOperandException;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.contentstream.operator.Operator;
@@ -33,6 +34,10 @@ public final class ShadingFill extends G
@Override
public void process(Operator operator, List<COSBase> operands) throws IOException
{
+ if (operands.size() < 1)
+ {
+ throw new MissingOperandException(operator, operands);
+ }
context.shadingFill((COSName) operands.get(0));
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetLineCapStyle.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetLineCapStyle.java?rev=1715409&r1=1715408&r2=1715409&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetLineCapStyle.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetLineCapStyle.java Fri Nov 20 20:21:22 2015
@@ -16,14 +16,14 @@
*/
package org.apache.pdfbox.contentstream.operator.state;
+import java.io.IOException;
import java.util.List;
-import org.apache.pdfbox.cos.COSBase;
-import org.apache.pdfbox.cos.COSNumber;
+import org.apache.pdfbox.contentstream.operator.MissingOperandException;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorProcessor;
-
-import java.io.IOException;
+import org.apache.pdfbox.cos.COSBase;
+import org.apache.pdfbox.cos.COSNumber;
/**
* J: Set the line cap style.
@@ -34,6 +34,10 @@ public class SetLineCapStyle extends Ope
@Override
public void process(Operator operator, List<COSBase> arguments) throws IOException
{
+ if (arguments.size() < 1)
+ {
+ throw new MissingOperandException(operator, arguments);
+ }
int lineCapStyle = ((COSNumber)arguments.get( 0 )).intValue();
context.getGraphicsState().setLineCap( lineCapStyle );
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetLineJoinStyle.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetLineJoinStyle.java?rev=1715409&r1=1715408&r2=1715409&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetLineJoinStyle.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetLineJoinStyle.java Fri Nov 20 20:21:22 2015
@@ -24,6 +24,7 @@ import org.apache.pdfbox.contentstream.o
import org.apache.pdfbox.contentstream.operator.OperatorProcessor;
import java.io.IOException;
+import org.apache.pdfbox.contentstream.operator.MissingOperandException;
/**
* j: Set the line join style.
@@ -34,6 +35,10 @@ public class SetLineJoinStyle extends Op
@Override
public void process(Operator operator, List<COSBase> arguments) throws IOException
{
+ if (arguments.size() < 1)
+ {
+ throw new MissingOperandException(operator, arguments);
+ }
int lineJoinStyle = ((COSNumber)arguments.get( 0 )).intValue();
context.getGraphicsState().setLineJoin( lineJoinStyle );
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetLineMiterLimit.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetLineMiterLimit.java?rev=1715409&r1=1715408&r2=1715409&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetLineMiterLimit.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetLineMiterLimit.java Fri Nov 20 20:21:22 2015
@@ -16,14 +16,15 @@
*/
package org.apache.pdfbox.contentstream.operator.state;
+import java.io.IOException;
import java.util.List;
-import org.apache.pdfbox.cos.COSBase;
-import org.apache.pdfbox.cos.COSNumber;
+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.COSNumber;
-import java.io.IOException;
/**
* M: Set miter limit.
@@ -34,6 +35,10 @@ public class SetLineMiterLimit extends O
@Override
public void process(Operator operator, List<COSBase> arguments) throws IOException
{
+ if (arguments.size() < 1)
+ {
+ throw new MissingOperandException(operator, arguments);
+ }
COSNumber miterLimit = (COSNumber)arguments.get( 0 );
context.getGraphicsState().setMiterLimit( miterLimit.floatValue() );
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetRenderingIntent.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetRenderingIntent.java?rev=1715409&r1=1715408&r2=1715409&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetRenderingIntent.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetRenderingIntent.java Fri Nov 20 20:21:22 2015
@@ -19,6 +19,7 @@ package org.apache.pdfbox.contentstream.
import java.io.IOException;
import java.util.List;
+import org.apache.pdfbox.contentstream.operator.MissingOperandException;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.contentstream.operator.Operator;
@@ -35,6 +36,10 @@ public class SetRenderingIntent extends
@Override
public void process(Operator operator, List<COSBase> operands) throws IOException
{
+ if (operands.size() < 1)
+ {
+ throw new MissingOperandException(operator, operands);
+ }
COSName value = (COSName)operands.get(0);
context.getGraphicsState().setRenderingIntent(RenderingIntent.fromString(value.getName()));
}