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 2021/11/10 03:46:01 UTC
svn commit: r1894890 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSStream.java
Author: tilman
Date: Wed Nov 10 03:46:00 2021
New Revision: 1894890
URL: http://svn.apache.org/viewvc?rev=1894890&view=rev
Log:
PDFBOX-4892: avoid memory leak, as suggested by valerybokov
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSStream.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSStream.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSStream.java?rev=1894890&r1=1894889&r2=1894890&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSStream.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSStream.java Wed Nov 10 03:46:00 2021
@@ -423,21 +423,33 @@ public class COSStream extends COSDictio
@Override
public void close() throws IOException
{
- if (closeScratchFile && scratchFile != null)
+ try
{
- scratchFile.close();
- scratchFile = null;
+ if (closeScratchFile && scratchFile != null)
+ {
+ scratchFile.close();
+ scratchFile = null;
+ }
}
- // marks the scratch file pages as free
- if (randomAccess != null)
+ finally
{
- randomAccess.close();
- randomAccess = null;
- }
- if (randomAccessReadView != null)
- {
- randomAccessReadView.close();
- randomAccessReadView = null;
+ try
+ {
+ // marks the scratch file pages as free
+ if (randomAccess != null)
+ {
+ randomAccess.close();
+ randomAccess = null;
+ }
+ }
+ finally
+ {
+ if (randomAccessReadView != null)
+ {
+ randomAccessReadView.close();
+ randomAccessReadView = null;
+ }
+ }
}
}