Remove event handlers from SocketAsyncEventArgs in NetworkStream

jstedfast · Jul 24, 2021 · 028985a · 028985a
1 parent c5c4c80
commit 028985a
Showing 1 changed file with 19 additions and 9 deletions.
diff --git a/MailKit/Net/NetworkStream.cs b/MailKit/Net/NetworkStream.cs
@@ -127,6 +127,23 @@ void AsyncOperationCompleted (object sender, SocketAsyncEventArgs args)
 			tcs.TrySetException (new SocketException ((int) args.SocketError));
 		}
 
+		void Cleanup ()
+		{
+			if (send != null) {
+				send.Completed -= AsyncOperationCompleted;
+				send.AcceptSocket = null;
+				send?.Dispose ();
+				send = null;
+			}
+
+			if (recv != null) {
+				recv.Completed -= AsyncOperationCompleted;
+				recv.AcceptSocket = null;
+				recv.Dispose ();
+				recv = null;
+			}
+		}
+
 		void Disconnect ()
 		{
 			try {
@@ -139,10 +156,7 @@ void Disconnect ()
 				return;
 			} finally {
 				connected = false;
-				send.Dispose ();
-				send = null;
-				recv.Dispose ();
-				recv = null;
+				Cleanup ();
 			}
 		}
 
@@ -278,11 +292,7 @@ protected override void Dispose (bool disposing)
 					ownsSocket = false;
 					Disconnect ();
 				} else {
-					send?.Dispose ();
-					send = null;
-
-					recv?.Dispose ();
-					recv = null;
+					Cleanup ();
 				}
 			}