Avoid NullReferenceException in TcpClient.EndConnect

When the timeout is shorter than the time TcpClient.ConnectAsync takes to throw The task.Wait returns before the end of the task, then dispose the Tcpclient before the end of its ConnectAsync call
nats-io · Jun 12, 2024 · cbd9c37 · cbd9c37
1 parent 711388d
commit cbd9c37
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/NATS.Client/Connection.cs b/src/NATS.Client/Connection.cs
@@ -394,16 +394,17 @@ public virtual void open(Srv s, Options options)
                         if (!task.Wait(TimeSpan.FromMilliseconds(options.Timeout)))
                         {
                             nce = new NATSConnectionException("timeout");
+                            task.ContinueWith(t => close(client));
                         }
                     }
                     catch (Exception e)
                     {
                         nce = new NATSConnectionException(e.Message);
+                        close(client);
                     }
 
                     if (nce != null)
                     {
-                        close(client);
                         client = null;
                         throw nce;
                     }
@@ -435,11 +436,10 @@ private static bool remoteCertificateValidation(
             public virtual void close(TcpClient c)
             {
 #if NET46
-                    c?.Close();
+                c?.Close();
 #else
                 c?.Dispose();
 #endif
-                c = null;
             }
 
             public void makeTLS()