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 2016/11/15 17:59:10 UTC
svn commit: r1769865 -
/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java
Author: tilman
Date: Tue Nov 15 17:59:09 2016
New Revision: 1769865
URL: http://svn.apache.org/viewvc?rev=1769865&view=rev
Log:
PDFBOX-3572: avoid NPE due to BC sometimes returning null instead of an empty array
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java?rev=1769865&r1=1769864&r2=1769865&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java Tue Nov 15 17:59:09 2016
@@ -267,7 +267,11 @@ public abstract class SecurityHandler
int n;
while ((n = data.read(buffer)) != -1)
{
- output.write(decryptCipher.update(buffer, 0, n));
+ byte[] dst = decryptCipher.update(buffer, 0, n);
+ if (dst != null)
+ {
+ output.write(dst);
+ }
}
output.write(decryptCipher.doFinal());
}