PDFBOX-5742: fix the collection of indirect object keys

git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1914934 13f79535-47bb-0310-9956-ffa450edef68
apache · Dec 26, 2023 · 57c5879 · 57c5879
1 parent fb94c1b
commit 57c5879
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 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
@@ -780,7 +780,6 @@ public void getIndirectObjectKeys(List<COSObjectKey> indirectObjects)
             }
             if (cosBase instanceof COSObject)
             {
-                indirectObjects.add(cosBaseKey);
                 // dereference object
                 cosBase = ((COSObject) cosBase).getObject();
             }
@@ -794,6 +793,11 @@ else if (cosBase instanceof COSArray)
                 // descend to included array to collect all included indirect objects
                 ((COSArray) cosBase).getIndirectObjectKeys(indirectObjects);
             }
+            else if (cosBaseKey != null)
+            {
+                // add key for all indirect objects other than COSDictionary/COSArray
+                indirectObjects.add(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
@@ -1461,7 +1461,6 @@ public void getIndirectObjectKeys(List<COSObjectKey> indirectObjects)
             }
             if (cosBase instanceof COSObject)
             {
-                indirectObjects.add(cosBaseKey);
                 // dereference object
                 cosBase = ((COSObject) cosBase).getObject();
             }
@@ -1475,6 +1474,11 @@ else if (cosBase instanceof COSArray)
                 // descend to included array to collect all included indirect objects
                 ((COSArray) cosBase).getIndirectObjectKeys(indirectObjects);
             }
+            else if (cosBaseKey != null)
+            {
+                // add key for all indirect objects other than COSDictionary/COSArray
+                indirectObjects.add(cosBaseKey);
+            }
         }
     }