Dispose CancellationTokenSource

technosoftkpk · Feb 7, 2022 · f56828b · f56828b
1 parent 22c896b
commit f56828b
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/FluentFTP/Streams/FtpSocketStream.cs b/FluentFTP/Streams/FtpSocketStream.cs
@@ -979,16 +979,18 @@ public async Task ConnectAsync(string host, int port, FtpIpVersion ipVersions, C
 #if CORE
 				if (this.ConnectTimeout > 0)
 				{
-					var timeoutSrc = new CancellationTokenSource();
-					timeoutSrc.CancelAfter(this.ConnectTimeout);
-
-					var tokenSrc = CancellationTokenSource.CreateLinkedTokenSource(
-						token, timeoutSrc.Token);
-					token = tokenSrc.Token;
+					using (var timeoutSrc = CancellationTokenSource.CreateLinkedTokenSource(token))
+					{
+						timeoutSrc.CancelAfter(this.ConnectTimeout);
+						await EnableCancellation(m_socket.ConnectAsync(addresses[i], port), timeoutSrc.Token, () => CloseSocket());
+						break;
+					}
+				}
+				else
+				{
+					await EnableCancellation(m_socket.ConnectAsync(addresses[i], port), token, () => CloseSocket());
+					break;
 				}
-
-				await EnableCancellation(m_socket.ConnectAsync(addresses[i], port), token, () => CloseSocket());
-				break;
 #else
 				var connectResult = m_socket.BeginConnect(addresses[i], port, null, null);
 				await EnableCancellation(Task.Factory.FromAsync(connectResult, m_socket.EndConnect), token, () => CloseSocket());