PDFBOX-5707: avoid NPE when collecting all indirect objects keys of a…

… COSArray/COSDictionary git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1913426 13f79535-47bb-0310-9956-ffa450edef68
apache · Oct 29, 2023 · 18a1931 · 18a1931
1 parent 13dd016
commit 18a1931
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/pdfbox/src/main/java/org/apache/pdfbox/cos/COSArray.java b/pdfbox/src/main/java/org/apache/pdfbox/cos/COSArray.java
@@ -79,8 +79,13 @@ public void add( COSBase object )
      */
     public void add( COSObjectable object )
     {
-        objects.add( object.getCOSObject() );
-        getUpdateState().update(object.getCOSObject());
+        COSBase base = null;
+        if (object != null)
+        {
+            base = object.getCOSObject();
+        }
+        objects.add(base);
+        getUpdateState().update(base);
     }
 
     /**
@@ -764,6 +769,10 @@ public void getIndirectObjectKeys(List<COSObjectKey> indirectObjects)
 
         for (COSBase cosBase : objects)
         {
+            if (cosBase == null)
+            {
+                continue;
+            }
             COSObjectKey cosBaseKey = cosBase.getKey();
             if (cosBaseKey != null && indirectObjects.contains(cosBaseKey))
             {

diff --git a/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java b/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java
@@ -1452,7 +1452,7 @@ public void getIndirectObjectKeys(List<COSObjectKey> indirectObjects)
         for (Entry<COSName, COSBase> entry : items.entrySet())
         {
             COSBase cosBase = entry.getValue();
-            COSObjectKey cosBaseKey = cosBase.getKey();
+            COSObjectKey cosBaseKey = cosBase != null ? cosBase.getKey() : null;
             // avoid endless recursions
             if (COSName.PARENT.equals(entry.getKey())
                     || (cosBaseKey != null && indirectObjects.contains(cosBaseKey)))