Skip to content

Commit efcd93c

Browse files
committed
PDFBOX-5968: avoid NPE
git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1924173 13f79535-47bb-0310-9956-ffa450edef68
1 parent b59505e commit efcd93c

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -818,8 +818,12 @@ else if (destOCP != null && srcOCP != null)
818818
{
819819
int srcKey = entry.getKey();
820820
maxSrcKey = Math.max(srcKey, maxSrcKey);
821-
destNumberTreeAsMap.put(destParentTreeNextKey + srcKey,
822-
cloner.cloneForNewDocument(entry.getValue().getCOSObject()));
821+
COSObjectable value = entry.getValue();
822+
if (value != null)
823+
{
824+
value = cloner.cloneForNewDocument(value.getCOSObject());
825+
destNumberTreeAsMap.put(destParentTreeNextKey + srcKey, value);
826+
}
823827
}
824828
destParentTreeNextKey += maxSrcKey + 1;
825829
PDNumberTreeNode newParentTreeNode = new PDNumberTreeNode(PDParentTreeValue.class);
@@ -1105,8 +1109,12 @@ private void mergeIDTree(PDFCloneUtility cloner,
11051109
}
11061110
else
11071111
{
1108-
destNames.put(entry.getKey(),
1109-
new PDStructureElement(cloner.cloneForNewDocument(entry.getValue().getCOSObject())));
1112+
if (entry.getValue() != null)
1113+
{
1114+
PDStructureElement structureElement = new PDStructureElement(
1115+
cloner.cloneForNewDocument(entry.getValue().getCOSObject()));
1116+
destNames.put(entry.getKey(), structureElement);
1117+
}
11101118
}
11111119
}
11121120
destIDTree = new PDStructureElementNameTreeNode();

0 commit comments

Comments
 (0)