Added disposal of stream and socket

Author: papafe

src/MongoDB.Driver/Core/Connections/TcpStreamFactory.cs

@@ -53,24 +53,40 @@ public Stream CreateStream(EndPoint endPoint, CancellationToken cancellationToke
             var targetEndpoint = useProxy ? new DnsEndPoint(socks5ProxySettings.Host, socks5ProxySettings.Port) : endPoint;
 
 #if NET472
-            var socket = CreateSocket(targetEndpoint);
-            Connect(socket, targetEndpoint, cancellationToken);
-            var stream = CreateNetworkStream(socket);
-            if (useProxy)
+            Socket socket = null;
+            NetworkStream stream = null;
+
+            try
             {
-                Socks5Helper.PerformSocks5Handshake(stream, endPoint, socks5ProxySettings.Authentication, cancellationToken);
+                socket = CreateSocket(targetEndpoint);
+                Connect(socket, targetEndpoint, cancellationToken);
+                stream = CreateNetworkStream(socket);
+                if (useProxy)
+                {
+                    Socks5Helper.PerformSocks5Handshake(stream, endPoint, socks5ProxySettings.Authentication, cancellationToken);
+                }
+
+                return stream;
             }
+            catch
+            {
+                socket?.Dispose();
+                stream?.Dispose();
 
-            return stream;
+                throw;
+            }
 #else
             var resolved = ResolveEndPoints(targetEndpoint);
-            for (int i = 0; i < resolved.Length; i++)
+            for (var i = 0; i < resolved.Length; i++)
             {
+                Socket socket = null;
+                NetworkStream stream = null;
+
                 try
                 {
-                    var socket = CreateSocket(resolved[i]);
+                    socket = CreateSocket(resolved[i]);
                     Connect(socket, resolved[i], cancellationToken);
-                    var stream = CreateNetworkStream(socket);
+                    stream = CreateNetworkStream(socket);
 
                     if (useProxy)
                     {
@@ -81,6 +97,9 @@ public Stream CreateStream(EndPoint endPoint, CancellationToken cancellationToke
                 }
                 catch
                 {
+                    socket?.Dispose();
+                    stream?.Dispose();
+
                     // if we have tried all of them and still failed,
                     // then blow up.
                     if (i == resolved.Length - 1)