Fix file descriptor leak (regression in 2.4.0)

as described in #101 Hat tip: xiaoxiang1238
kohlschutter · Mar 12, 2022 · 3bf9097 · 3bf9097
1 parent c92417c
commit 3bf9097
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/junixsocket-common/src/main/java/org/newsclub/net/unix/AFUNIXServerSocket.java b/junixsocket-common/src/main/java/org/newsclub/net/unix/AFUNIXServerSocket.java
@@ -217,11 +217,13 @@ public boolean isClosed() {
   @Override
   public AFUNIXSocket accept() throws IOException {
     AFUNIXSocket as = newSocketInstance();
-    boolean success = implementation.accept0(as.getAFImpl());
+
+    boolean success = implementation.accept0(as.getAFImpl(false));
     if (isClosed()) {
       // We may have connected to the socket to unblock it
       throw new SocketException("Socket is closed");
     }
+    as.getAFImpl(true); // trigger create
 
     if (!success) {
       // non-blocking socket, nothing to accept

diff --git a/junixsocket-common/src/main/java/org/newsclub/net/unix/AFUNIXSocket.java b/junixsocket-common/src/main/java/org/newsclub/net/unix/AFUNIXSocket.java
@@ -392,7 +392,11 @@ public static void main(String[] args) {
   }
 
   AFUNIXSocketImpl getAFImpl() {
-    if (created.compareAndSet(false, true)) {
+    return getAFImpl(true);
+  }
+
+  AFUNIXSocketImpl getAFImpl(boolean createSocket) {
+    if (createSocket && created.compareAndSet(false, true)) {
       try {
         getSoTimeout(); // trigger create via java.net.Socket
       } catch (SocketException e) {