Skip to content

Fix crash if command sent to pwsh is just whitespace #10977

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
anmenaga merged 2 commits into from
Nov 4, 2019
Merged

Fix crash if command sent to pwsh is just whitespace #10977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
118a35f
Fix crash if command sent to pwsh is just whitespace
SteveL-MSFT Nov 2, 2019
8bb43a5
address Rob's feedback
SteveL-MSFT Nov 3, 2019
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
2 changes: 1 addition & 1 deletion 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 @@ -534,7 +534,7 @@ internal static void EarlyParse(string[] args)

string switchKey = switchKeyResults.SwitchKey;

if (MatchSwitch(switchKey, match: "settingsfile", smallestUnambiguousMatch: "settings"))
if (!string.IsNullOrEmpty(switchKey) && MatchSwitch(switchKey, match: "settingsfile", smallestUnambiguousMatch: "settings"))
{
// parse setting file arg and don't write error as there is no host yet.
if (!TryParseSettingFileHelper(args, ++i, parser: null))
Expand Down
10 changes: 10 additions & 0 deletions test/powershell/Host/ConsoleHost.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,16 @@ Describe "ConsoleHost unit tests" -tags "Feature" {
$observed = echo hello | pwsh -noprofile $testFilePath e -
$observed | Should -BeExactly "h-llo"
}

It "Empty command should fail" {
pwsh -noprofile -c ''
$LASTEXITCODE | Should -Be 64
}

It "Whitespace command should succeed" {
pwsh -noprofile -c ' ' | Should -BeNullOrEmpty
$LASTEXITCODE | Should -Be 0
}
}

Context "-Login pwsh switch" {
Expand Down