From b593edeb2b2d62434ca19418974227cc4ecaefa1 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Wed, 27 Dec 2017 12:14:38 +0100
Subject: Loop.cpp: always close testSocketFD

was missing in the non-abstract code path

(partially) fixes ArcticaProject/nx-libs#612
---
 nxcomp/src/Loop.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index ce1f92a68..cc0efa361 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -3944,12 +3944,13 @@ void SetupDisplaySocket(int &addr_family, sockaddr *&addr,
     addr_length = len +3;
 
     int ret = connect(testSocketFD, (struct sockaddr *) xServerAddrABSTRACT, addr_length);
+    close(testSocketFD);
+
     if (ret == 0) {
 
         cerr << "Info" << ": Using abstract X11 socket in kernel namespace "
              << "for accessing DISPLAY=:" << xPort << ".\n";
 
-        close(testSocketFD);
         addr = (sockaddr *) xServerAddrABSTRACT;
         delete [] display;
         return;
-- 
cgit v1.2.3