Skip to content

Fix memory leak in GetFileShares #25896

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 3 commits into from
Oct 7, 2025
Merged

Fix memory leak in GetFileShares #25896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0f487a
Fix memory leak in `GetFileShares`
xtqqczze Aug 29, 2025
c514be1
Address feedback
xtqqczze Oct 2, 2025
56df5e8
Update src/System.Management.Automation/engine/Interop/Windows/NetApi…
xtqqczze Oct 3, 2025
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
58 changes: 34 additions & 24 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 @@ -5199,38 +5199,48 @@ internal static List<string> GetFileShares(string machine, bool ignoreHidden)
uint numEntries = 0;
uint totalEntries;
uint resumeHandle = 0;
int result = Interop.Windows.NetShareEnum(
machine,
level: 1,
out shBuf,
Interop.Windows.MAX_PREFERRED_LENGTH,
out numEntries,
out totalEntries,
ref resumeHandle);

var shares = new List<string>();
if (result == Interop.Windows.ERROR_SUCCESS || result == Interop.Windows.ERROR_MORE_DATA)
try
{
for (int i = 0; i < numEntries; ++i)
{
nint curInfoPtr = shBuf + (Marshal.SizeOf<SHARE_INFO_1>() * i);
SHARE_INFO_1 shareInfo = Marshal.PtrToStructure<SHARE_INFO_1>(curInfoPtr);
int result = Interop.Windows.NetShareEnum(
machine,
level: 1,
out shBuf,
Interop.Windows.MAX_PREFERRED_LENGTH,
out numEntries,
out totalEntries,
ref resumeHandle);

if ((shareInfo.type & Interop.Windows.STYPE_MASK) != Interop.Windows.STYPE_DISKTREE)
var shares = new List<string>();
if (result == Interop.Windows.ERROR_SUCCESS || result == Interop.Windows.ERROR_MORE_DATA)
{
for (int i = 0; i < numEntries; ++i)
{
continue;
}
nint curInfoPtr = shBuf + (Marshal.SizeOf<SHARE_INFO_1>() * i);
SHARE_INFO_1 shareInfo = Marshal.PtrToStructure<SHARE_INFO_1>(curInfoPtr);

if (ignoreHidden && shareInfo.netname.EndsWith('$'))
{
continue;
if ((shareInfo.type & Interop.Windows.STYPE_MASK) != Interop.Windows.STYPE_DISKTREE)
{
continue;
}

if (ignoreHidden && shareInfo.netname.EndsWith('$'))
{
continue;
}

shares.Add(shareInfo.netname);
}
}

shares.Add(shareInfo.netname);
return shares;
}
finally
{
if (shBuf != nint.Zero)
{
Interop.Windows.NetApiBufferFree(shBuf);
}
}

return shares;
#endif
}

Expand Down
16 changes: 16 additions & 0 deletions src/System.Management.Automation/engine/Interop/Windows/NetApiBufferFree.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

#nullable enable

using System.Runtime.InteropServices;

internal static partial class Interop
{
internal static unsafe partial class Windows
{

[LibraryImport("Netapi32.dll")]
internal static partial uint NetApiBufferFree(nint Buffer);
}
}
Loading