Merge pull request #33 from AlexGhiondea/Fix32

Add null check for argument which caused strange behavior
AlexGhiondea · Mar 26, 2019 · 53933e7 · 53933e7
2 parents fbdfaee + 952ce42
commit 53933e7
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 5 deletions.
diff --git a/src/CommandLine.csproj b/src/CommandLine.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>1.5.1</Version>
-    <AssemblyVersion>1.5.1.0</AssemblyVersion>
+    <Version>1.5.2</Version>
+    <AssemblyVersion>1.5.2.0</AssemblyVersion>
     <FileVersion>$(AssemblyVersion)</FileVersion>
   </PropertyGroup>
 

diff --git a/src/Parser.cs b/src/Parser.cs
@@ -123,7 +123,9 @@ private static string[] ExpandResponseFiles(string[] args)
             bool shouldExpand = false;
             for (int i = 0; i < args.Length; i++)
             {
-                if (args[i][0] == '@')
+                // it might be possible that the args[i] value is an empty string.
+                // we should check and make sure we have a valid value here before trying to check the '@' char
+                if (!string.IsNullOrEmpty(args[i]) && args[i][0] == '@')
                 {
                     shouldExpand = true;
                     break;
@@ -138,7 +140,7 @@ private static string[] ExpandResponseFiles(string[] args)
 
             for (int i = 0; i < args.Length; i++)
             {
-                if (args[i][0] == '@')
+                if (!string.IsNullOrEmpty(args[i]) && args[i][0] == '@')
                 {
                     string fileName = args[i].Substring(1);
                     // does the file exist?
@@ -278,7 +280,7 @@ private static void SplitCommandLineIntoSegments(string line, ref List<string> n
 
         private static List<PropertyInfo> ParseOptionalParameters<TOptions>(string[] args, int offsetInArray, ArgumentGroupInfo TypeArgumentInfo, TOptions options, ref int currentLogicalPosition) where TOptions : new()
         {
-            // we are going to assume that all optionl parameters are not matched to values in 'args'
+            // we are going to assume that all optional parameters are not matched to values in 'args'
             List<PropertyInfo> unmatched = new List<PropertyInfo>(TypeArgumentInfo.OptionalArguments.Values);
             // process the optional arguments
             while (offsetInArray + currentLogicalPosition < args.Length)

diff --git a/test/CommandLineTests.Help.cs b/test/CommandLineTests.Help.cs
@@ -656,5 +656,31 @@ public void HelpForTypeWithRequiredAndOptionalEnumsAndLists()
                 new TextAndColor(ConsoleColor.Black, ")")
             );
         }
+
+        [Fact]
+        public void HelpWhenPassMoreParametersThanExpected()
+        {
+            TestWriter _printer = new TestWriter();
+
+            var options = Helpers.Parse<MorePassedInThanRequired>("this expects 2 args", _printer);
+
+             Validate(_printer,
+                new TextAndColor(ConsoleColor.Red, "Error"), 
+                new TextAndColor(ConsoleColor.Black, @": Optional parameter name should start with '-' 
+"), 
+                new TextAndColor(ConsoleColor.Black, "Usage: "), 
+                new TextAndColor(ConsoleColor.Black, " "), 
+                new TextAndColor(ConsoleColor.White, "testhost.exe"), 
+                new TextAndColor(ConsoleColor.Black, " "), 
+                new TextAndColor(ConsoleColor.Cyan, "a"), 
+                new TextAndColor(ConsoleColor.Black, " "), 
+                new TextAndColor(ConsoleColor.Cyan, "b"), 
+                new TextAndColor(ConsoleColor.Black, " "), 
+                new TextAndColor(ConsoleColor.Black, "For detailed information run '"), 
+                new TextAndColor(ConsoleColor.White, "testhost --help"), 
+                new TextAndColor(ConsoleColor.Black, "'." )
+             );
+        }
+
     }
 }
diff --git a/test/TestObjects/Negative.cs b/test/TestObjects/Negative.cs
@@ -51,4 +51,13 @@ internal class RequiredNegative_InvalidPositionForRequiredArg
         [RequiredArgument(1, "a", "")]
         public Enum1 p1 { get; set; }
     }
+
+    internal class MorePassedInThanRequired
+    {
+        [RequiredArgument(0, "a", "")]
+        public string p1 { get; set; }
+
+        [RequiredArgument(1, "b", "")]
+        public string p2 { get; set; }
+    }
 }