Skip to content

Fix completion crash for certain providers #20815

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 3 commits into from
Dec 8, 2023
Merged

Fix completion crash for certain providers #20815

Changes from all commits
Commits
Show all changes
3 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
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
19 changes: 13 additions & 6 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 @@ -4764,17 +4764,20 @@ private static List<CompletionResult> GetDefaultProviderResults(
// Save relevant info and try again to get just the names.
foreach (dynamic child in childItemOutput)
{
childrenInfoTable.Add(GetChildNameFromPsObject(child, provider.ItemSeparator), child.PSIsContainer);
// TryAdd is used because some providers (like SCCM) may include duplicate PSPaths in a container.
_ = childrenInfoTable.TryAdd(GetChildNameFromPsObject(child, provider.ItemSeparator), child.PSIsContainer);
}

_ = context.Helper.CurrentPowerShell
.AddCommandWithPreferenceSetting("Microsoft.PowerShell.Management\\Get-ChildItem")
.AddParameter("LiteralPath", pathInfo.Path)
.AddParameter("Name");
.AddParameter("Name")
.AddCommandWithPreferenceSetting("Microsoft.PowerShell.Utility\\Sort-Object")
.AddParameter("Unique");
childItemOutput = context.Helper.ExecuteCurrentPowerShell(out _);
foreach (var child in childItemOutput)
foreach (PSObject child in childItemOutput)
{
var childName = (string)child.BaseObject;
string childName = (string)child.BaseObject;
childNameList.Add(childName);
}
}
Expand All @@ -4783,8 +4786,12 @@ private static List<CompletionResult> GetDefaultProviderResults(
foreach (dynamic child in childItemOutput)
{
var childName = GetChildNameFromPsObject(child, provider.ItemSeparator);
childrenInfoTable.Add(childName, child.PSIsContainer);
childNameList.Add(childName);

// TryAdd is used because some providers (like SCCM) may include duplicate PSPaths in a container.
if (childrenInfoTable.TryAdd(childName, child.PSIsContainer))
{
childNameList.Add(childName);
}
}
}

Expand Down