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 2023/04/13 06:28:48 UTC
svn commit: r1909115 - in /pdfbox/trunk/io/src/main/java/org/apache/pdfbox/io: IOUtils.java RandomAccessReadMemoryMappedFile.java
Author: lehmi
Date: Thu Apr 13 06:28:48 2023
New Revision: 1909115
URL: http://svn.apache.org/viewvc?rev=1909115&view=rev
Log:
PDFBOX-5586: added null checks based on a proposal by Matt Bamberger
Modified:
pdfbox/trunk/io/src/main/java/org/apache/pdfbox/io/IOUtils.java
pdfbox/trunk/io/src/main/java/org/apache/pdfbox/io/RandomAccessReadMemoryMappedFile.java
Modified: pdfbox/trunk/io/src/main/java/org/apache/pdfbox/io/IOUtils.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/io/src/main/java/org/apache/pdfbox/io/IOUtils.java?rev=1909115&r1=1909114&r2=1909115&view=diff
==============================================================================
--- pdfbox/trunk/io/src/main/java/org/apache/pdfbox/io/IOUtils.java (original)
+++ pdfbox/trunk/io/src/main/java/org/apache/pdfbox/io/IOUtils.java Thu Apr 13 06:28:48 2023
@@ -193,7 +193,10 @@ public final class IOUtils
{
try
{
- UNMAPPER.ifPresent(u -> u.accept(buf));
+ if (buf != null)
+ {
+ UNMAPPER.ifPresent(u -> u.accept(buf));
+ }
}
catch (Exception e)
{
Modified: pdfbox/trunk/io/src/main/java/org/apache/pdfbox/io/RandomAccessReadMemoryMappedFile.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/io/src/main/java/org/apache/pdfbox/io/RandomAccessReadMemoryMappedFile.java?rev=1909115&r1=1909114&r2=1909115&view=diff
==============================================================================
--- pdfbox/trunk/io/src/main/java/org/apache/pdfbox/io/RandomAccessReadMemoryMappedFile.java (original)
+++ pdfbox/trunk/io/src/main/java/org/apache/pdfbox/io/RandomAccessReadMemoryMappedFile.java Thu Apr 13 06:28:48 2023
@@ -99,8 +99,11 @@ public class RandomAccessReadMemoryMappe
{
fileChannel.close();
}
- Optional.ofNullable(unmapper).ifPresent(u -> u.accept(mappedByteBuffer));
- mappedByteBuffer = null;
+ if (mappedByteBuffer != null)
+ {
+ Optional.ofNullable(unmapper).ifPresent(u -> u.accept(mappedByteBuffer));
+ mappedByteBuffer = null;
+ }
}
/**