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 2016/08/02 16:07:17 UTC
svn commit: r1754967 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSArrayList.java
Author: tilman
Date: Tue Aug 2 16:07:17 2016
New Revision: 1754967
URL: http://svn.apache.org/viewvc?rev=1754967&view=rev
Log:
PDFBOX-3448: avoid NullPointerException for null elements
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSArrayList.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSArrayList.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSArrayList.java?rev=1754967&r1=1754966&r2=1754967&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSArrayList.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSArrayList.java Tue Aug 2 16:07:17 2016
@@ -291,10 +291,18 @@ public class COSArrayList<E> implements
List<Float> retval = null;
if( floatArray != null )
{
- List<Float> numbers = new ArrayList<Float>();
+ List<Float> numbers = new ArrayList<Float>(floatArray.size());
for( int i=0; i<floatArray.size(); i++ )
{
- numbers.add(((COSNumber) floatArray.getObject(i)).floatValue());
+ COSBase base = floatArray.getObject(i);
+ if (base instanceof COSNumber)
+ {
+ numbers.add(((COSNumber) base).floatValue());
+ }
+ else
+ {
+ numbers.add(null);
+ }
}
retval = new COSArrayList<Float>( numbers, floatArray );
}