Skip to content

Fix Memory Leak in System.DirectoryServices.Protocols caused by not freeing native memory #41053

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
merged 1 commit into from
Aug 19, 2020
Merged

Fix Memory Leak in System.DirectoryServices.Protocols caused by not freeing native memory #41053

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
3 changes: 3 additions & 0 deletions src/libraries/Common/src/Interop/Linux/OpenLdap/Interop.Ldap.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,9 @@ internal static partial class Interop
[DllImport(Libraries.OpenLdap, EntryPoint = "ldap_memfree", CharSet = CharSet.Ansi)]
public static extern void ldap_memfree([In] IntPtr value);

[DllImport(Libraries.OpenLdap, EntryPoint = "ldap_msgfree", CharSet = CharSet.Ansi)]
public static extern void ldap_msgfree([In] IntPtr value);

[DllImport(Libraries.OpenLdap, EntryPoint = "ldap_modify_ext", CharSet = CharSet.Ansi)]
public static extern int ldap_modify([In] ConnectionHandle ldapHandle, string dn, IntPtr attrs, IntPtr servercontrol, IntPtr clientcontrol, ref int messageNumber);

Expand Down
2 changes: 2 additions & 0 deletions ...rectoryServices.Protocols/src/System/DirectoryServices/Protocols/Interop/LdapPal.Linux.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ internal static int GetLastErrorFromConnection(ConnectionHandle ldapHandle)

internal static void FreeMemory(IntPtr outValue) => Interop.ldap_memfree(outValue);

internal static void FreeMessage(IntPtr outValue) => Interop.ldap_msgfree(outValue);

internal static int ModifyDirectoryEntry(ConnectionHandle ldapHandle, string dn, IntPtr attrs, IntPtr servercontrol, IntPtr clientcontrol, ref int messageNumber) =>
Interop.ldap_modify(ldapHandle, dn, attrs, servercontrol, clientcontrol, ref messageNumber);

Expand Down
2 changes: 2 additions & 0 deletions ...ctoryServices.Protocols/src/System/DirectoryServices/Protocols/Interop/LdapPal.Windows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ internal static int ExtendedDirectoryOperation(ConnectionHandle ldapHandle, stri

internal static void FreeMemory(IntPtr outValue) => Interop.ldap_memfree(outValue);

internal static void FreeMessage(IntPtr outValue) => Interop.ldap_msgfree(outValue);

internal static int ModifyDirectoryEntry(ConnectionHandle ldapHandle, string dn, IntPtr attrs, IntPtr servercontrol, IntPtr clientcontrol, ref int messageNumber) =>
Interop.ldap_modify(ldapHandle, dn, attrs, servercontrol, clientcontrol, ref messageNumber);

Expand Down
2 changes: 1 addition & 1 deletion ...DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/ldap/LdapConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1604,7 +1604,7 @@ internal async ValueTask<DirectoryResponse> ConstructResponseAsync(int messageId

if (ldapResult != IntPtr.Zero)
{
LdapPal.FreeMemory(ldapResult);
LdapPal.FreeMessage(ldapResult);
}
}
}
Expand Down