From e76e47953f6f295350a3bb7eeb801b33aac34eae Mon Sep 17 00:00:00 2001 From: Dimitrios Anyfantakis Date: Thu, 2 Nov 2023 18:37:16 +0100 Subject: [PATCH] Close file handle in ConfigurationWriter --- .../main/java/proguard/ConfigurationWriter.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/base/src/main/java/proguard/ConfigurationWriter.java b/base/src/main/java/proguard/ConfigurationWriter.java index f4214075..7751efe4 100644 --- a/base/src/main/java/proguard/ConfigurationWriter.java +++ b/base/src/main/java/proguard/ConfigurationWriter.java @@ -51,7 +51,7 @@ public class ConfigurationWriter implements AutoCloseable private final PrintWriter writer; private File configurationFile; - private File baseDir; + private String baseDirName; /** @@ -62,7 +62,10 @@ public class ConfigurationWriter implements AutoCloseable this(PrintWriterUtil.createPrintWriterOut(configurationFile)); this.configurationFile = configurationFile; - baseDir = configurationFile.getParentFile(); + if (configurationFile.getParentFile() != null) + { + baseDirName = configurationFile.getParentFile().getAbsolutePath() + File.separator; + } } @@ -801,13 +804,9 @@ public class ConfigurationWriter implements AutoCloseable String fileName = file.getAbsolutePath(); // See if we can convert the file name into a relative file name. - if (baseDir != null) + if (baseDirName != null && fileName.startsWith(baseDirName)) { - String baseDirName = baseDir.getAbsolutePath() + File.separator; - if (fileName.startsWith(baseDirName)) - { - fileName = fileName.substring(baseDirName.length()); - } + fileName = fileName.substring(baseDirName.length()); } return quotedString(fileName);