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 2020/09/17 18:00:26 UTC
svn commit: r1881797 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java
Author: tilman
Date: Thu Sep 17 18:00:26 2020
New Revision: 1881797
URL: http://svn.apache.org/viewvc?rev=1881797&view=rev
Log:
PDFBOX-4892: avoid NPE, use convenience method
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java?rev=1881797&r1=1881796&r2=1881797&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java Thu Sep 17 18:00:26 2020
@@ -157,10 +157,14 @@ public final class PublicKeySecurityHand
byte[] envelopedData = null;
// the bytes of each recipient in the recipients array
- COSArray array = (COSArray) encryption.getCOSObject().getItem(COSName.RECIPIENTS);
+ COSArray array = encryption.getCOSObject().getCOSArray(COSName.RECIPIENTS);
+ if (array == null && defaultCryptFilterDictionary != null)
+ {
+ array = defaultCryptFilterDictionary.getCOSObject().getCOSArray(COSName.RECIPIENTS);
+ }
if (array == null)
{
- array = (COSArray) defaultCryptFilterDictionary.getCOSObject().getItem(COSName.RECIPIENTS);
+ throw new IOException("/Recipients entry is missing in encryption dictionary");
}
byte[][] recipientFieldsBytes = new byte[array.size()][];
//TODO encryption.getRecipientsLength() and getRecipientStringAt() should be deprecated