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 2019/10/08 16:12:21 UTC
svn commit: r1868149 -
/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java
Author: tilman
Date: Tue Oct 8 16:12:21 2019
New Revision: 1868149
URL: http://svn.apache.org/viewvc?rev=1868149&view=rev
Log:
PDFBOX-4665: close file on exception, as suggested by Chris Cockayne
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java?rev=1868149&r1=1868148&r2=1868149&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java Tue Oct 8 16:12:21 2019
@@ -226,10 +226,16 @@ public final class PDImageXObject extend
String ext = name.substring(dot + 1).toLowerCase();
if ("jpg".equals(ext) || "jpeg".equals(ext))
{
- FileInputStream fis = new FileInputStream(file);
- PDImageXObject imageXObject = JPEGFactory.createFromStream(doc, fis);
- fis.close();
- return imageXObject;
+ FileInputStream fis = null;
+ try
+ {
+ fis = new FileInputStream(file);
+ return JPEGFactory.createFromStream(doc, fis);
+ }
+ finally
+ {
+ IOUtils.closeQuietly(fis);
+ }
}
if ("tif".equals(ext) || "tiff".equals(ext))
{