Fixes.

SonarSource · Nov 10, 2023 · dec8329 · dec8329
1 parent 96cdf04
commit dec8329
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Tests/SonarScanner.MSBuild.Common.Test/ProcessRunnerTests.cs b/Tests/SonarScanner.MSBuild.Common.Test/ProcessRunnerTests.cs
@@ -316,7 +316,7 @@ public void ProcRunner_ArgumentQuoting()
         [DataRow(@"]", @"]")]
         [DataRow(@"!", @"!")]
         [DataRow(@".", @".")]
-        [DataRow(@"*", @"*")]
+        [DataRow(@"*", @"* ")] // See ProcRunner_ArgumentQuotingForwardedByBatchScriptToJava
         [DataRow(@"?", @"?")]
         [DataRow(@"=", @"""=""")]
         [DataRow(@"a=b", @"""a=b""")]
@@ -398,7 +398,7 @@ public void ProcRunner_ArgumentQuotingForwardedByBatchScript(string parameter, s
         [DataRow(@"]", @"]")]
         [DataRow(@"!", @"!")]
         [DataRow(@".", @".")]
-        [DataRow(@"*", @"*")]
+        [DataRow(@"*", @"* ")] // See ProcRunner_ArgumentQuotingForwardedByBatchScriptToJava
         [DataRow(@"?", @"?")]
         [DataRow(@"=", @"=")]
         [DataRow(@"a=b", @"a=b")]

diff --git a/src/SonarScanner.MSBuild.Common/ProcessRunnerArguments.cs b/src/SonarScanner.MSBuild.Common/ProcessRunnerArguments.cs
@@ -95,15 +95,15 @@ static string EscapeSpecialCharacter(string argument) =>
                         : sb.Append(c),
                     static sb => sb.ToString());
 
-            static bool NeedsToBeEnclosedInDoubleQuotes(string argument)
-                => argument.Any(c => c is ' ' or '\t' or ',' or ';' or '\u00FF' or '=' or '"')
-                || argument.EndsWith("*") || argument.EndsWith(@"*""");
+            static bool NeedsToBeEnclosedInDoubleQuotes(string argument) =>
+                argument.Any(static c => c is ' ' or '\t' or ',' or ';' or '\u00FF' or '=' or '"')
+                || argument.EndsWith("*");
 
             static string EncloseInDoubleQuotes(string argument)
             {
                 if (IsEnclosedInDoubleQuotes(argument))
                 {
-                    // Remove any existing outer double quotes.
+                    // Remove any existing outer double quotes. We add them back later.
                     argument = argument.Substring(1, argument.Length - 2);
                 }
                 // Any inline double quote need to escaped by doubling " -> ""