Ensure RemoteInvokeHandle is disposed

dotnet · Jun 6, 2024 · cb3a84c · cb3a84c
1 parent 6575440
commit cb3a84c
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketDuplicationTests.cs b/src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketDuplicationTests.cs
@@ -330,8 +330,16 @@ public async Task DuplicateAndClose_TcpServerHandler(AddressFamily addressFamily
                 else
                 {
                     RemoteInvokeHandle hServerProc = RemoteExecutor.Invoke(HandlerServerCode, _ipcPipeName);
-                    await RunCommonHostLogic(hServerProc.Process.Id);
-                    await hServerProc.DisposeAsync();
+
+                    // Since RunCommonHostLogic can throw, we need to make sure the server process is disposed
+                    try
+                    {
+                        await RunCommonHostLogic(hServerProc.Process.Id);
+                    }
+                    finally
+                    {
+                        await hServerProc.DisposeAsync();
+                    }
                 }
 
                 async Task RunCommonHostLogic(int processId)