Fix #5794 Close socket on bind failure

jetty · Dec 12, 2020 · 9349ed2 · 9349ed2
1 parent 639cad6
commit 9349ed2
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 5 deletions.
diff --git a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ConnectorServer.java b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ConnectorServer.java
@@ -42,6 +42,7 @@
 import javax.rmi.ssl.SslRMIClientSocketFactory;
 
 import org.eclipse.jetty.util.HostPort;
+import org.eclipse.jetty.util.IO;
 import org.eclipse.jetty.util.component.AbstractLifeCycle;
 import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.log.Logger;
@@ -243,7 +244,15 @@ private ServerSocket createServerSocket(InetAddress address, int port) throws IO
             if (_sslContextFactory == null)
             {
                 ServerSocket server = new ServerSocket();
-                server.bind(new InetSocketAddress(address, port));
+                try
+                {
+                    server.bind(new InetSocketAddress(address, port));
+                }
+                catch (Throwable e)
+                {
+                    IO.close(server);
+                    throw e;
+                }
                 return server;
             }
             else

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java
@@ -20,7 +20,6 @@
 
 import java.io.Closeable;
 import java.io.IOException;
-import java.net.BindException;
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
@@ -41,6 +40,7 @@
 import org.eclipse.jetty.io.ManagedSelector;
 import org.eclipse.jetty.io.SelectorManager;
 import org.eclipse.jetty.io.SocketChannelEndPoint;
+import org.eclipse.jetty.util.IO;
 import org.eclipse.jetty.util.annotation.ManagedAttribute;
 import org.eclipse.jetty.util.annotation.ManagedObject;
 import org.eclipse.jetty.util.annotation.Name;
@@ -344,8 +344,9 @@ protected ServerSocketChannel openAcceptChannel() throws IOException
             {
                 serverChannel.socket().bind(bindAddress, getAcceptQueueSize());
             }
-            catch (BindException e)
+            catch (Throwable e)
             {
+                IO.close(serverChannel);
                 throw new IOException("Failed to bind to " + bindAddress, e);
             }
         }

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java
@@ -272,7 +272,15 @@ private ServerSocket listen()
         {
             ServerSocket serverSocket = new ServerSocket();
             serverSocket.setReuseAddress(true);
-            serverSocket.bind(new InetSocketAddress(InetAddress.getByName(host), port));
+            try
+            {
+                serverSocket.bind(new InetSocketAddress(InetAddress.getByName(host), port));
+            }
+            catch (Throwable e)
+            {
+                IO.close(serverSocket);
+                throw e;
+            }
             if (port == 0)
             {
                 port = serverSocket.getLocalPort();

diff --git a/...t-distribution/src/main/java/org/eclipse/jetty/tests/distribution/DistributionTester.java b/...t-distribution/src/main/java/org/eclipse/jetty/tests/distribution/DistributionTester.java
@@ -176,7 +176,15 @@ public int freePort() throws IOException
         try (ServerSocket server = new ServerSocket())
         {
             server.setReuseAddress(true);
-            server.bind(new InetSocketAddress("localhost", 0));
+            try
+            {
+                server.bind(new InetSocketAddress("localhost", 0));
+            }
+            catch (Throwable t)
+            {
+                IO.close(server);
+                throw t;
+            }
             return server.getLocalPort();
         }
     }