Swallow ObjectDisposedException when aborting QuicStream from Cancell…

…ationAction (#75179) Co-authored-by: Radek Zikmund <radekzikmund@microsoft.com>
dotnet · Sep 8, 2022 · 5d71eeb · 5d71eeb
1 parent f8b6128
commit 5d71eeb
Showing 1 changed file with 24 additions and 6 deletions.
diff --git a/src/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs b/src/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
@@ -70,9 +70,18 @@ public sealed partial class QuicStream
     {
         CancellationAction = target =>
         {
-            if (target is QuicStream stream)
+            try
             {
-                stream.Abort(QuicAbortDirection.Read, stream._defaultErrorCode);
+                if (target is QuicStream stream)
+                {
+                    stream.Abort(QuicAbortDirection.Read, stream._defaultErrorCode);
+                }
+            }
+            catch (ObjectDisposedException)
+            {
+                // We collided with a Dispose in another thread. This can happen
+                // when using CancellationTokenSource.CancelAfter.
+                // Ignore the exception
             }
         }
     };
@@ -83,9 +92,18 @@ public sealed partial class QuicStream
     {
         CancellationAction = target =>
         {
-            if (target is QuicStream stream)
+            try
+            {
+                if (target is QuicStream stream)
+                {
+                    stream.Abort(QuicAbortDirection.Write, stream._defaultErrorCode);
+                }
+            }
+            catch (ObjectDisposedException)
             {
-                stream.Abort(QuicAbortDirection.Write, stream._defaultErrorCode);
+                // We collided with a Dispose in another thread. This can happen
+                // when using CancellationTokenSource.CancelAfter.
+                // Ignore the exception
             }
         }
     };
@@ -491,8 +509,8 @@ private unsafe int HandleEventStartComplete(ref START_COMPLETE data)
     private unsafe int HandleEventReceive(ref RECEIVE data)
     {
         ulong totalCopied = (ulong)_receiveBuffers.CopyFrom(
-            new ReadOnlySpan<QUIC_BUFFER>(data.Buffers, (int) data.BufferCount),
-            (int) data.TotalBufferLength,
+            new ReadOnlySpan<QUIC_BUFFER>(data.Buffers, (int)data.BufferCount),
+            (int)data.TotalBufferLength,
             data.Flags.HasFlag(QUIC_RECEIVE_FLAGS.FIN));
         if (totalCopied < data.TotalBufferLength)
         {