Skip to content

Add null check for args in CommandLineParser #13451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjmholt merged 4 commits into from
Aug 28, 2020
Merged

Add null check for args in CommandLineParser #13451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b98c4d8
Add null check for args in CommandLineParser
iSazonov Aug 15, 2020
3dcb608
Address feedback
iSazonov Aug 20, 2020
f5ee4a1
Add localized string
iSazonov Aug 28, 2020
3208121
Update src/Microsoft.PowerShell.ConsoleHost/resources/CommandLinePara…
iSazonov Aug 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,6 +700,14 @@ internal void Parse(string[] args)
throw new InvalidOperationException("This instance has already been used. Create a new instance.");
}

for (int i = 0; i < args.Length; i++)
{
if (args[i] is null)
{
throw new ArgumentNullException(nameof(args), CommandLineParameterParserStrings.NullElementInArgs);
}
}

// Indicates that we've called this method on this instance, and that when it's done, the state variables
// will reflect the parse.
_dirty = true;
Expand Down
3 changes: 3 additions & 0 deletions src/Microsoft.PowerShell.ConsoleHost/resources/CommandLineParameterParserStrings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,4 +219,7 @@ Valid formats are:
<data name="STANotImplemented" xml:space="preserve">
<value>Parameter -STA is not supported on this platform.</value>
</data>
<data name="NullElementInArgs" xml:space="preserve">
<value>The specified arguments must not contain null elements.</value>
</data>
</root>
9 changes: 9 additions & 0 deletions test/xUnit/csharp/test_CommandLineParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,15 @@ public static void Test_Throws_On_Reuse()
Assert.Throws<System.InvalidOperationException>(() => cpp.Parse(new string[0]));
}

[Theory]
[InlineData("arg1", null, "arg3")]
public static void Test_ARGS_With_Null(params string[] commandLine)
{
var cpp = new CommandLineParameterParser();

Assert.Throws<System.ArgumentNullException>(() => cpp.Parse(commandLine));
}

[Theory]
[InlineData("noexistfilename")]
public static void TestDefaultParameterIsFileName_Not_Exist(params string[] commandLine)
Expand Down