Loop.cpp: always close testSocketFD

was missing in the non-abstract code path (partially) fixes ArcticaProject/nx-libs#612

Loop.cpp: always close testSocketFD
b593edeb · Ulrich Sibiller · 4107159e · b593edeb
Commit b593edeb authored Dec 27, 2017 by Ulrich Sibiller
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

Loop.cpp nxcomp/src/Loop.cpp +2 -1

No files found.
--- 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;