You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2010/06/18 07:46:08 UTC
svn commit: r955842 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPageNode.java
Author: lehmi
Date: Fri Jun 18 05:46:08 2010
New Revision: 955842
URL: http://svn.apache.org/viewvc?rev=955842&view=rev
Log:
PDFBOX-737: added a fix for a potential NPE. Patch by Adam Nichols (adam at swmc dot com)
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPageNode.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPageNode.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPageNode.java?rev=955842&r1=955841&r2=955842&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPageNode.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPageNode.java Fri Jun 18 05:46:08 2010
@@ -16,6 +16,8 @@
*/
package org.apache.pdfbox.pdmodel;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
@@ -42,6 +44,11 @@ public class PDPageNode implements COSOb
private COSDictionary page;
/**
+ * Log instance.
+ */
+ private static final Log log = LogFactory.getLog(PDPageNode.class);
+
+ /**
* Creates a new instance of PDPage.
*/
public PDPageNode()
@@ -178,7 +185,11 @@ public class PDPageNode implements COSOb
private static COSArray getAllKids(List result, COSDictionary page, boolean recurse)
{
COSArray kids = (COSArray)page.getDictionaryObject( COSName.KIDS );
-
+ if ( kids == null)
+ {
+ log.error("No Kids found in getAllKids(). Probably a malformed pdf.");
+ return null;
+ }
for( int i=0; i<kids.size(); i++ )
{
COSBase obj = kids.getObject( i );