Fix credential event callback reference lifetime

This commit is contained in:
Ryan Newington committed 2026-08-30 15:42:48 +10:00
1 parent b0a9886708
commit 7fad9cb351
18 files changed
+1105 -8

No files matched your search

@@ -12,14 +12,17 @@ namespace Lithnet.CredentialProvider
{
this.logger.LogTrace("Advise");
if (this.eventsUnknown != IntPtr.Zero)
{
this.ReleaseCredentialEvents();
}
if (pcpce != null)
{
this.eventsUnknown = Marshal.GetIUnknownForObject(pcpce);
this.Controls.AssignEvents(pcpce);
this.events = pcpce;
this.events2 = pcpce as ICredentialProviderCredentialEvents2;
var intPtr = Marshal.GetIUnknownForObject(pcpce);
Marshal.AddRef(intPtr);
}
this.OnLoad();
@@ -28,6 +31,7 @@ namespace Lithnet.CredentialProvider
}
catch (Exception ex)
{
this.ReleaseCredentialEvents();
this.logger.LogError(ex, "Advise failed");
return HRESULT.E_FAIL;
}
@@ -39,12 +43,9 @@ namespace Lithnet.CredentialProvider
{
this.logger.LogTrace("Unadvise");
if (this.events != null)
if (this.eventsUnknown != IntPtr.Zero)
{
this.Controls.UnassignEvents();
var intPtr = Marshal.GetIUnknownForObject(this.events);
Marshal.Release(intPtr);
this.events = null;
this.ReleaseCredentialEvents();
}
this.OnUnload();
@@ -58,6 +59,26 @@ namespace Lithnet.CredentialProvider
}
}
private void ReleaseCredentialEvents()
{
try
{
this.Controls.UnassignEvents();
}
finally
{
this.events2 = null;
this.events = null;
if (this.eventsUnknown != IntPtr.Zero)
{
IntPtr unknown = this.eventsUnknown;
this.eventsUnknown = IntPtr.Zero;
Marshal.Release(unknown);
}
}
}
int ICredentialProviderCredential.SetSelected(out int pbAutoLogon)
{
pbAutoLogon = 0;
@@ -11,6 +11,7 @@ namespace Lithnet.CredentialProvider
public abstract partial class CredentialTile
{
private protected readonly ICredentialProviderLogger logger;
private IntPtr eventsUnknown;
private protected ICredentialProviderCredentialEvents events;
private protected ICredentialProviderCredentialEvents2 events2;
private protected ControlCollection controls;