admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix memory leak in GetFileShares (#25896)

Browse Source
This commit is contained in:
xtqqczze
2025-10-07 14:28:19 +05:00
committed by GitHub
parent b5279a25a1
commit 60d4bc39bc
2 changed files with 51 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
+35 -25
View File
@@ -5204,38 +5204,48 @@ namespace System.Management.Automation
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)
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)
{
nint curInfoPtr = shBuf + (Marshal.SizeOf<SHARE_INFO_1>() * i);
SHARE_INFO_1 shareInfo = Marshal.PtrToStructure<SHARE_INFO_1>(curInfoPtr);
if ((shareInfo.type & Interop.Windows.STYPE_MASK) != Interop.Windows.STYPE_DISKTREE)
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;
}
shares.Add(shareInfo.netname);
if (ignoreHidden && shareInfo.netname.EndsWith('$'))
{
continue;
}
shares.Add(shareInfo.netname);
}
}
return shares;
}
finally
{
if (shBuf != nint.Zero)
{
Interop.Windows.NetApiBufferFree(shBuf);
}
}
return shares;
#endif
}
src/System.Management.Automation/engine/Interop/Windows/NetApiBufferFree.cs
+16
View File
@@ -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);
}
}