You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2020/05/17 16:25:11 UTC
svn commit: r1877866 - in /pdfbox/branches/issue45: ./ pdfbox/
pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java
Author: lehmi
Date: Sun May 17 16:25:11 2020
New Revision: 1877866
URL: http://svn.apache.org/viewvc?rev=1877866&view=rev
Log:
PDFBOX-4071: ensure that all needed bytes are read
Modified:
pdfbox/branches/issue45/ (props changed)
pdfbox/branches/issue45/pdfbox/ (props changed)
pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java
Propchange: pdfbox/branches/issue45/
------------------------------------------------------------------------------
Merged /pdfbox/trunk:r1877865
Merged /pdfbox/branches/2.0:r1877865
Propchange: pdfbox/branches/issue45/pdfbox/
------------------------------------------------------------------------------
Merged /pdfbox/branches/2.0/pdfbox:r1877865
Modified: pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java?rev=1877866&r1=1877865&r2=1877866&view=diff
==============================================================================
--- pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java (original)
+++ pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java Sun May 17 16:25:11 2020
@@ -333,7 +333,7 @@ public abstract class SecurityHandler
if (decrypt)
{
// read IV from stream
- int ivSize = data.read(iv);
+ int ivSize = (int) IOUtils.populateBuffer(data, iv);
if (ivSize == -1)
{
return false;
@@ -425,7 +425,7 @@ public abstract class SecurityHandler
// PDFBOX-3229 check case where metadata is not encrypted despite /EncryptMetadata missing
InputStream is = stream.createRawInputStream();
byte buf[] = new byte[10];
- is.read(buf);
+ IOUtils.populateBuffer(is, buf);
is.close();
if (Arrays.equals(buf, "<?xpacket ".getBytes(Charsets.ISO_8859_1)))
{