Skip to content

Handle disposed AsyncWaitHandle during BeginInvoke completion #14998

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

Open
jaywang-cn wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Handle disposed AsyncWaitHandle during BeginInvoke completion #14998

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
9 changes: 8 additions & 1 deletion src/System.Windows.Forms/System/Windows/Forms/Control.ThreadMethodEntry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,14 @@ internal void Complete()
lock (_invokeSyncObject)
{
IsCompleted = true;
_resetEvent?.Set();
try
{
_resetEvent?.Set();
}
catch (ObjectDisposedException)

@Shyam-Gupta Shyam-Gupta Sep 1, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of catching an exception, can we check: if(!_marshaler.IsDisposed)

@KlausLoeffelmann KlausLoeffelmann Sep 4, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. We could have the waitHandle disposed ...

IAsyncResult result = control.BeginInvoke(callback);
result.AsyncWaitHandle.Dispose();

... but not the marshaling control.

{
// AsyncWaitHandle exposes the event and allows callers to dispose it before completion.
}
Comment thread
KlausLoeffelmann marked this conversation as resolved.
}
}
}
Expand Down
15 changes: 15 additions & 0 deletions src/test/unit/System.Windows.Forms/System/Windows/Forms/ControlTests.Methods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4276,6 +4276,21 @@ await Task.Run(() =>
Assert.Equal(0, createdCallCount);
}

[WinFormsFact]
public void Control_BeginInvoke_DisposedAsyncWaitHandle_CompletesCallback()
{
using Control control = new();
Assert.NotEqual(IntPtr.Zero, control.Handle);
bool callbackInvoked = false;
IAsyncResult asyncResult = control.BeginInvoke(() => callbackInvoked = true);
asyncResult.AsyncWaitHandle.Dispose();

control.TestAccessor.Dynamic.InvokeMarshaledCallbacks();

Assert.True(callbackInvoked);
Assert.True(asyncResult.IsCompleted);
}

[WinFormsFact]
public void Control_Invoke_Action_calls_correct_method()
{
Expand Down
Loading