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 race condition between DisconnectAsync and Dispose (#16536)

Browse Source
This commit is contained in:
Bar Arnon
2021-12-02 23:25:12 +05:00
committed by GitHub
parent 64d2fe26f3
commit 1920b1b6ea
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/System.Management.Automation/engine/remoting/client/RemotingProtocol2.cs
+12 -4
View File
@@ -813,7 +813,7 @@ namespace System.Management.Automation.Internal
// what thread this callback is made from. If it was made from a transport
// callback event then a deadlock may occur when DisconnectAsync is called on
// that same thread.
ThreadPool.QueueUserWorkItem(new WaitCallback(StartDisconnectAsync), RemoteSession);
ThreadPool.QueueUserWorkItem(new WaitCallback(StartDisconnectAsync));
}
}
}
@@ -821,10 +821,18 @@ namespace System.Management.Automation.Internal
/// <summary>
/// WaitCallback method to start an asynchronous disconnect.
/// </summary>
/// <param name="remoteSession"></param>
private void StartDisconnectAsync(object remoteSession)
/// <param name="state"></param>
private void StartDisconnectAsync(object state)
{
((ClientRemoteSession)remoteSession).DisconnectAsync();
var remoteSession = RemoteSession;
try
{
remoteSession?.DisconnectAsync();
}
catch
{
// remoteSession may have already been disposed resulting in unexpected exceptions.
}
}
/// <summary>