Skip to content

Add null check for Windows PowerShell install path #12296

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
iSazonov merged 1 commit into from
Apr 14, 2020
Merged

Add null check for Windows PowerShell install path #12296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 7 additions & 1 deletion src/System.Management.Automation/engine/hostifaces/PowerShellProcessInstance.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ static PowerShellProcessInstance()
PwshExePath = Path.Combine(Utils.DefaultPowerShellAppBase, "pwsh");
#else
PwshExePath = Path.Combine(Utils.DefaultPowerShellAppBase, "pwsh.exe");
WinPwshExePath = Path.Combine(Utils.GetApplicationBaseFromRegistry(Utils.DefaultPowerShellShellID), "powershell.exe");
var winPowerShellDir = Utils.GetApplicationBaseFromRegistry(Utils.DefaultPowerShellShellID);
WinPwshExePath = string.IsNullOrEmpty(winPowerShellDir) ? null : Path.Combine(winPowerShellDir, "powershell.exe");
#endif
}

Expand All @@ -59,6 +60,11 @@ public PowerShellProcessInstance(Version powerShellVersion, PSCredential credent
startingWindowsPowerShell51 = (powerShellVersion != null) && (powerShellVersion.Major == 5) && (powerShellVersion.Minor == 1);
if (startingWindowsPowerShell51)
{
if (WinPwshExePath == null)
{
throw new PSInvalidOperationException(RemotingErrorIdStrings.WindowsPowerShellNotPresent);
}

exePath = WinPwshExePath;

if (useWow64)
Expand Down
3 changes: 3 additions & 0 deletions src/System.Management.Automation/resources/RemotingErrorIdStrings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1693,4 +1693,7 @@ All WinRM sessions connected to PowerShell session configurations, such as Micro
<data name="RemoteDebuggerError" xml:space="preserve">
<value>Remote debugger exception: {0}, error message: {1}</value>
</data>
<data name="WindowsPowerShellNotPresent" xml:space="preserve">
<value>Unable to create Windows PowerShell process because Windows PowerShell could not be found on this machine.</value>
</data>
</root>