Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

make sure we close OS handle if socket is finalized without disposing #38499

Merged
wfurt merged 2 commits into from
Jun 16, 2019
Merged

make sure we close OS handle if socket is finalized without disposing #38499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96b0637
socket_finalize_37044
wfurt Jun 13, 2019
0b30868
update test
wfurt Jun 14, 2019
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
11 changes: 3 additions & 8 deletions src/System.Net.Sockets/src/System/Net/Sockets/Socket.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4461,16 +4461,11 @@ private void DoConnect(EndPoint endPointSnapshot, Internals.SocketAddress socket

protected virtual void Dispose(bool disposing)
{
if (!disposing)
{
return;
}

if (NetEventSource.IsEnabled)
{
try
{
NetEventSource.Info(this, $"disposing:true CleanedUp:{CleanedUp}");
NetEventSource.Info(this, $"disposing:{disposing} CleanedUp:{CleanedUp}");
NetEventSource.Enter(this);
}
catch (Exception exception) when (!ExceptionCheck.IsFatal(exception)) { }
Expand All @@ -4490,11 +4485,11 @@ protected virtual void Dispose(bool disposing)
try
{
int timeout = _closeTimeout;
if (timeout == 0)
if (timeout == 0 || !disposing)
{
// Abortive.
if (NetEventSource.IsEnabled) NetEventSource.Info(this, "Calling _handle.Dispose()");
_handle.Dispose();
_handle?.Dispose();
}
else
{
Expand Down
1 change: 1 addition & 0 deletions src/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEngine.Unix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,7 @@ private void EventLoop()
if (context != null)
{
context.HandleEvents(_buffer[i].Events);
context = null;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/System.Net.Sockets/tests/FunctionalTests/DisposedSocketTests.netcoreapp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ namespace System.Net.Sockets.Tests
{
public partial class DisposedSocket
{
[ActiveIssue(37044, TestPlatforms.AnyUnix)]
[Theory]
[InlineData(false)]
[InlineData(true)]
Expand All @@ -22,6 +21,7 @@ public async Task NonDisposedSocket_SafeHandlesCollected(bool clientAsync)
RetryHelper.Execute(() =>
{
GC.Collect();
GC.WaitForPendingFinalizers();
Assert.Equal(0, handles.Count(h => h.IsAlive));
});
}
Expand Down