Fix encoding of non-ascii contents written to parameter files.

bazelbuild · Jul 18, 2023 · 55ac165 · 55ac165
1 parent d39cf07
commit 55ac165
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/actions/BUILD b/src/main/java/com/google/devtools/build/lib/actions/BUILD
@@ -192,6 +192,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/util:filetype",
         "//src/main/java/com/google/devtools/build/lib/util:os",
         "//src/main/java/com/google/devtools/build/lib/util:shell_escaper",
+        "//src/main/java/com/google/devtools/build/lib/util:string",
         "//src/main/java/com/google/devtools/build/lib/util:var_int",
         "//src/main/java/com/google/devtools/build/lib/util/io",
         "//src/main/java/com/google/devtools/build/lib/vfs",

diff --git a/src/main/java/com/google/devtools/build/lib/actions/ParameterFile.java b/src/main/java/com/google/devtools/build/lib/actions/ParameterFile.java
@@ -25,6 +25,7 @@
 import com.google.devtools.build.lib.util.GccParamFileEscaper;
 import com.google.devtools.build.lib.util.ShellEscaper;
 import com.google.devtools.build.lib.vfs.PathFragment;
+import com.google.devtools.build.lib.util.StringUtil;
 import java.io.BufferedOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -33,6 +34,7 @@
 import java.nio.CharBuffer;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetEncoder;
+import java.util.stream.StreamSupport;
 
 /**
  * Support for parameter file generation (as used by gcc and other tools, e.g.
@@ -116,14 +118,16 @@ public static void writeParameterFile(
 
   private static void writeContent(
       OutputStream outputStream, Iterable<String> arguments, Charset charset) throws IOException {
+    ImmutableList<String> args = StreamSupport.stream(arguments.spliterator(), false)
+        .map(StringUtil::decodeBytestringUtf8).collect(ImmutableList.toImmutableList());
     if (charset.equals(ISO_8859_1)) {
-      writeContentLatin1(outputStream, arguments);
+      writeContentLatin1(outputStream, args);
     } else if (charset.equals(UTF_8)) {
-      writeContentUtf8(outputStream, arguments);
+      writeContentUtf8(outputStream, args);
     } else {
       // Generic charset support
       OutputStreamWriter out = new OutputStreamWriter(outputStream, charset);
-      for (String line : arguments) {
+      for (String line : args) {
         out.write(line);
         out.write('\n');
       }