Fix potential NullReferenceException during cancellation. Fixes #1472

bgrainger · bgrainger · commit 0a8feb16190a · 2024-04-21T18:46:47.000-07:00
diff --git a/src/MySqlConnector/Core/ServerSession.cs b/src/MySqlConnector/Core/ServerSession.cs
@@ -1025,7 +1025,7 @@ private async Task<bool> OpenTcpSocketAsync(ConnectionSettings cs, ILoadBalancer
 				{
 					tcpClient = new(ipAddress.AddressFamily);
 
-					using (cancellationToken.Register(() => tcpClient.Client?.Dispose()))
+					using (cancellationToken.Register(() => tcpClient?.Client?.Dispose()))
 					{
 						try
 						{

Original file line number	Diff line number	Diff line change
`@@ -1025,7 +1025,7 @@ private async Task<bool> OpenTcpSocketAsync(ConnectionSettings cs, ILoadBalancer`
`1025`	`1025`	`{`
`1026`	`1026`	`tcpClient = new(ipAddress.AddressFamily);`
`1027`	`1027`
`1028`		`- using (cancellationToken.Register(() => tcpClient.Client?.Dispose()))`
	`1028`	`+ using (cancellationToken.Register(() => tcpClient?.Client?.Dispose()))`
`1029`	`1029`	`{`
`1030`	`1030`	`try`
`1031`	`1031`	`{`