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:20:50 UTC
svn commit: r1877863 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java
Author: lehmi
Date: Sun May 17 16:20:50 2020
New Revision: 1877863
URL: http://svn.apache.org/viewvc?rev=1877863&view=rev
Log:
PDFBOX-4071: ensure that all needed bytes are read
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java?rev=1877863&r1=1877862&r2=1877863&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java Sun May 17 16:20:50 2020
@@ -357,7 +357,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;
@@ -457,7 +457,7 @@ public abstract class SecurityHandler
try (InputStream is = stream.createRawInputStream())
{
buf = new byte[10];
- long isResult = is.read(buf);
+ long isResult = IOUtils.populateBuffer(is, buf);
if (Long.compare(isResult, buf.length) != 0)
{