Escape empty arguments.

natemcmaster · Apr 25, 2019 · 0ed6092 · 0ed6092
1 parent cf83608
commit 0ed6092
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/CommandLineUtils/Utilities/ArgumentEscaper.cs b/src/CommandLineUtils/Utilities/ArgumentEscaper.cs
@@ -29,7 +29,7 @@ private static string EscapeSingleArg(string arg)
         {
             var sb = new StringBuilder();
 
-            var needsQuotes = ContainsWhitespace(arg);
+            var needsQuotes = arg.Length == 0 || ContainsWhitespace(arg);
             var isQuoted = needsQuotes || IsSurroundedWithQuotes(arg);
 
             if (needsQuotes)

diff --git a/test/CommandLineUtils.Tests/ArgumentEscaperTests.cs b/test/CommandLineUtils.Tests/ArgumentEscaperTests.cs
@@ -18,6 +18,7 @@ public class ArgumentEscaperTests
         [InlineData(new[] { @"C:\Program Files\dotnet\" }, @"""C:\Program Files\dotnet\\""")]
         [InlineData(new[] { @"backslash\""preceedingquote" }, @"backslash\\\""preceedingquote")]
         [InlineData(new[] { @""" hello nate """ }, @"""\"" hello nate \""""")]
+        [InlineData(new[] { "one", "", "three" }, "one \"\" three")]
         public void EscapesArguments(string[] args, string expected)
         {
             Assert.Equal(expected, ArgumentEscaper.EscapeAndConcatenate(args));