[X2Go-Commits] [nx-libs] 02/19: Loop.cpp: free display before leaving SetupDisplaySocket()

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 4107159e218c5d641306acf34abcb7596f63f7a5
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Wed Dec 27 12:13:43 2017 +0100

    Loop.cpp: free display before leaving SetupDisplaySocket()
    
    fixes a memory leak
---
 nxcomp/src/Loop.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index a4c7a95..ce1f92a 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -3877,6 +3877,8 @@ void SetupDisplaySocket(int &addr_family, sockaddr *&addr,
 
     cerr << "Error" << ": Invalid display '" << display << "'.\n";
 
+    delete [] display;
+
     HandleCleanup();
   }
 
@@ -3949,6 +3951,7 @@ void SetupDisplaySocket(int &addr_family, sockaddr *&addr,
 
         close(testSocketFD);
         addr = (sockaddr *) xServerAddrABSTRACT;
+        delete [] display;
         return;
 
     } else {
@@ -4000,6 +4003,7 @@ void SetupDisplaySocket(int &addr_family, sockaddr *&addr,
       cerr << "Error" << ": Error " << EGET() << " '" << ESTR()
            << "' checking '" << unixSocketDir << "'.\n";
 
+      delete [] display;
       HandleCleanup();
     }
 
@@ -4048,6 +4052,7 @@ void SetupDisplaySocket(int &addr_family, sockaddr *&addr,
       cerr << "Error" << ": Unknown display host '" << display
            << "'.\n";
 
+      delete [] display;
       HandleCleanup();
     }
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git