You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2021/12/26 17:26:42 UTC

svn commit: r1896429 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java

Author: tilman
Date: Sun Dec 26 17:26:41 2021
New Revision: 1896429

URL: http://svn.apache.org/viewvc?rev=1896429&view=rev
Log:
PDFBOX-5339: avoid NullPointerException

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java?rev=1896429&r1=1896428&r2=1896429&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java Sun Dec 26 17:26:41 2021
@@ -2501,15 +2501,15 @@ public class COSParser extends BaseParse
         {
             return;
         }
-        COSBase trailerEncryptItem = document.getTrailer().getItem(COSName.ENCRYPT);
-        if (trailerEncryptItem == null || trailerEncryptItem instanceof COSNull)
+        COSDictionary encryptionDictionary = document.getEncryptionDictionary();
+        if (encryptionDictionary == null)
         {
             return;
         }
 
         try
         {
-            encryption = new PDEncryption(document.getEncryptionDictionary());
+            encryption = new PDEncryption(encryptionDictionary);
             DecryptionMaterial decryptionMaterial;
             if (keyStoreInputStream != null)
             {