Author: tilman
Date: Tue Jun 24 13:21:36 2025
New Revision: 1926701
URL: http://svn.apache.org/viewvc?rev=1926701&view=rev
Log:
PDFBOX-6025: null is allowed
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDEmbeddedFilesNameTreeNode.java
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDStructureElementNameTreeNode.java
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/PDIntegerNameTreeNode.java
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDEmbeddedFilesNameTreeNode.java
URL:
http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDEmbeddedFilesNameTreeNode.java?rev=1926701&r1=1926700&r2=1926701&view=diff
==============================================================================
---
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDEmbeddedFilesNameTreeNode.java
(original)
+++
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDEmbeddedFilesNameTreeNode.java
Tue Jun 24 13:21:36 2025
@@ -49,7 +49,7 @@ public class PDEmbeddedFilesNameTreeNode
@Override
protected PDComplexFileSpecification convertCOSToPD( COSBase base ) throws
IOException
{
- if (!(base instanceof COSDictionary))
+ if (base != null && !(base instanceof COSDictionary))
{
throw new IOException("dictionary expected here, but got " + base);
}
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDStructureElementNameTreeNode.java
URL:
http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDStructureElementNameTreeNode.java?rev=1926701&r1=1926700&r2=1926701&view=diff
==============================================================================
---
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDStructureElementNameTreeNode.java
(original)
+++
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDStructureElementNameTreeNode.java
Tue Jun 24 13:21:36 2025
@@ -51,7 +51,7 @@ public class PDStructureElementNameTreeN
@Override
protected PDStructureElement convertCOSToPD( COSBase base ) throws
IOException
{
- if (!(base instanceof COSDictionary))
+ if (base != null && !(base instanceof COSDictionary))
{
throw new IOException("dictionary expected here, but got " + base);
}
Modified:
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/PDIntegerNameTreeNode.java
URL:
http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/PDIntegerNameTreeNode.java?rev=1926701&r1=1926700&r2=1926701&view=diff
==============================================================================
---
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/PDIntegerNameTreeNode.java
(original)
+++
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/PDIntegerNameTreeNode.java
Tue Jun 24 13:21:36 2025
@@ -49,7 +49,7 @@ public class PDIntegerNameTreeNode exten
@Override
protected COSInteger convertCOSToPD(COSBase base) throws IOException
{
- if (!(base instanceof COSInteger))
+ if (base != null && !(base instanceof COSInteger))
{
throw new IOException("integer expected here, but got " + base);
}