Avoid NullReferenceException in TcpClient.EndConnect (#899)

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 Co-authored-by: Paul BARRY DELONGCHAMPS <[email protected]>
nats-io · Jul 8, 2024 · e5aaea9 · e5aaea9
1 parent 26f64a9
commit e5aaea9
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()