Fix race condition in disposing STA SynchronizationContext #7229
+18
−1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes a race condition in the SingleThreadedSTASynchronizationContext class where the BlockingCollection could be disposed while the background thread was still consuming from it. The fix introduces a ManualResetEventSlim to ensure the thread completes before disposing the queue.
Changes:
- Added thread synchronization using
ManualResetEventSlimto ensure safe disposal - Modified the
Disposemethod to wait for thread completion before disposing resources - Added explanatory comments documenting the disposal flow
...TestFramework/TestFramework/Attributes/TestMethod/SingleThreadedSTASynchronizationContext.cs
Outdated
Show resolved
Hide resolved
...TestFramework/TestFramework/Attributes/TestMethod/SingleThreadedSTASynchronizationContext.cs
Outdated
Show resolved
Hide resolved
Contributor
|
@Youssef1313 I've opened a new pull request, #7231, to work on those changes. Once the pull request is ready, I'll request review from you. |
mariam-abdulla
approved these changes
Jan 15, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The test that was added in #7192 along with the implementation is flaky. This should fix it.