Skip to content

Fix completion crash for the SCCM provider #20915

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
daxian-dbw merged 8 commits into from
Jan 17, 2024
Merged

Fix completion crash for the SCCM provider #20915

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
461d6ab
Fix completion crash for certain providers
MartinGC94 Nov 29, 2023
8b24996
Merge branch 'PowerShell:master' into Fix3rdPartyProviderCrash
MartinGC94 Nov 29, 2023
beb71b8
Update src/System.Management.Automation/engine/CommandCompletion/Comp…
MartinGC94 Dec 8, 2023
01dae97
Fix SCCM provider completion crash
MartinGC94 Dec 13, 2023
ab72ca7
Revert unnecessary TryAdd changes.
MartinGC94 Dec 13, 2023
26ca48a
Merge branch 'PowerShell:master' into FixProviderCrashV2
MartinGC94 Dec 13, 2023
31ee6c2
Merge branch 'PowerShell:master' into FixProviderCrashV2
MartinGC94 Dec 14, 2023
032209e
Remove whitespace characters in a new line
daxian-dbw Jan 17, 2024
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
22 changes: 17 additions & 5 deletions src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4857,10 +4857,22 @@ private static List<CompletionResult> GetDefaultProviderResults(

private static string GetChildNameFromPsObject(dynamic psObject, char separator)
{
// The obvious solution would be to use the "PSChildName" property
// but some providers don't have it (like the Variable provider)
// So we use a substring of "PSPath" instead.
string childName = psObject.PSPath ?? string.Empty;
if (((PSObject)psObject).BaseObject is string result)
{
// The "Get-ChildItem" call for this provider returned a string that we assume is the child name.
// This is what the SCCM provider returns.
return result;
}

string childName = psObject.PSChildName;
if (childName is not null)
{
return childName;
}

// Some providers (Like the variable provider) don't include a PSChildName property
// so we get the child name from the path instead.
childName = psObject.PSPath ?? string.Empty;
int ProviderSeparatorIndex = childName.IndexOf("::", StringComparison.Ordinal);
childName = childName.Substring(ProviderSeparatorIndex + 2);
int indexOfName = childName.LastIndexOf(separator);
Expand All @@ -4871,7 +4883,7 @@ private static string GetChildNameFromPsObject(dynamic psObject, char separator)

return childName.Substring(indexOfName + 1);
}

/// <summary>
/// Takes a path and rebuilds it with the specified variable replacements.
/// Also escapes special characters as needed.
Expand Down