"Can't write configuration" error if -printconfiguration config param…

…eter is used without a value Guardsquare#263
inforeachinc · Jul 8, 2022 · 3fe3989 · 3fe3989
1 parent 3f8d783
commit 3fe3989
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/base/src/main/java/proguard/ConfigurationWriter.java b/base/src/main/java/proguard/ConfigurationWriter.java
@@ -24,7 +24,6 @@
 import org.apache.logging.log4j.Logger;
 import proguard.classfile.*;
 import proguard.classfile.util.ClassUtil;
-import proguard.optimize.Optimizer;
 import proguard.util.*;
 
 import java.io.*;
@@ -51,6 +50,7 @@ public class ConfigurationWriter implements AutoCloseable
 
     private final PrintWriter writer;
     private       File        baseDir;
+    private       File        file;
 
 
     /**
@@ -60,6 +60,7 @@ public ConfigurationWriter(File configurationFile) throws IOException
     {
         this(PrintWriterUtil.createPrintWriterOut(configurationFile));
 
+        file = configurationFile;
         baseDir = configurationFile.getParentFile();
     }
 
@@ -79,7 +80,7 @@ public ConfigurationWriter(PrintWriter writer) throws IOException
     @Override
     public void close() throws IOException
     {
-        PrintWriterUtil.closePrintWriter(baseDir, writer);
+        PrintWriterUtil.closePrintWriter(file, writer);
     }
 
 

diff --git a/base/src/main/java/proguard/ProGuard.java b/base/src/main/java/proguard/ProGuard.java
@@ -29,7 +29,6 @@
 import proguard.configuration.ConfigurationLoggingAdder;
 import proguard.evaluation.IncompleteClassHierarchyException;
 import proguard.configuration.InitialStateInfo;
-import proguard.io.ExtraDataEntryNameMap;
 import proguard.logging.Logging;
 import proguard.mark.Marker;
 import proguard.obfuscate.NameObfuscationReferenceFixer;
@@ -273,9 +272,7 @@ private void checkGpl()
      */
     private void printConfiguration() throws IOException
     {
-        PrintWriter pw = PrintWriterUtil.createPrintWriterOut(configuration.printConfiguration);
-
-        try (ConfigurationWriter configurationWriter = new ConfigurationWriter(pw))
+        try (ConfigurationWriter configurationWriter = new ConfigurationWriter(configuration.printConfiguration))
         {
             configurationWriter.write(configuration);
         }