You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ms...@apache.org on 2018/03/11 19:00:40 UTC
svn commit: r1826452 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java
Author: msahyoun
Date: Sun Mar 11 19:00:40 2018
New Revision: 1826452
URL: http://svn.apache.org/viewvc?rev=1826452&view=rev
Log:
PDFBOX-4071: move getDiskCacheFile into try statement as this will potentially cause the SecurityException
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java?rev=1826452&r1=1826451&r2=1826452&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java Sun Mar 11 19:00:40 2018
@@ -291,11 +291,12 @@ final class FileSystemFontProvider exten
private void saveDiskCache()
{
BufferedWriter writer = null;
+ File file = null;
try
{
- File file = getDiskCacheFile();
try
{
+ file = getDiskCacheFile();
writer = new BufferedWriter(new FileWriter(file));
}
catch (SecurityException e)
@@ -378,16 +379,20 @@ final class FileSystemFontProvider exten
}
List<FSFontInfo> results = new ArrayList<>();
- File file = getDiskCacheFile();
+
+ // Get the disk cache
+ File file = null;
boolean fileExists = false;
try
{
+ file = getDiskCacheFile();
fileExists = file.exists();
}
catch (SecurityException e)
{
LOG.debug("Error checking for file existence", e);
}
+
if (fileExists)
{
try (BufferedReader reader = new BufferedReader(new FileReader(file)))