Commit 6d8fe661 authored by Ulrich Sibiller's avatar Ulrich Sibiller

Loop.cpp: create xServerAddrUNIX only if required

parent 14a55891
...@@ -3912,10 +3912,7 @@ void SetupDisplaySocket(int &addr_family, sockaddr *&addr, ...@@ -3912,10 +3912,7 @@ void SetupDisplaySocket(int &addr_family, sockaddr *&addr,
nxinfo << "Loop: Using real X server on UNIX domain socket.\n" nxinfo << "Loop: Using real X server on UNIX domain socket.\n"
<< std::flush; << std::flush;
sockaddr_un *xServerAddrUNIX = new sockaddr_un;
addr_family = AF_UNIX; addr_family = AF_UNIX;
xServerAddrUNIX -> sun_family = AF_UNIX;
// //
// The scope of this function is to fill either the sockaddr_un // The scope of this function is to fill either the sockaddr_un
...@@ -3962,7 +3959,6 @@ void SetupDisplaySocket(int &addr_family, sockaddr *&addr, ...@@ -3962,7 +3959,6 @@ void SetupDisplaySocket(int &addr_family, sockaddr *&addr,
<< "for accessing DISPLAY=:" << xPort << ".\n"; << "for accessing DISPLAY=:" << xPort << ".\n";
addr = (sockaddr *) xServerAddrABSTRACT; addr = (sockaddr *) xServerAddrABSTRACT;
delete xServerAddrUNIX;
delete [] display; delete [] display;
return; return;
...@@ -4035,6 +4031,9 @@ void SetupDisplaySocket(int &addr_family, sockaddr *&addr, ...@@ -4035,6 +4031,9 @@ void SetupDisplaySocket(int &addr_family, sockaddr *&addr,
nxinfo << "Loop: Assuming X socket name '" << unixSocketName nxinfo << "Loop: Assuming X socket name '" << unixSocketName
<< "'.\n" << std::flush; << "'.\n" << std::flush;
sockaddr_un *xServerAddrUNIX = new sockaddr_un;
xServerAddrUNIX -> sun_family = AF_UNIX;
strcpy(xServerAddrUNIX -> sun_path, unixSocketName); strcpy(xServerAddrUNIX -> sun_path, unixSocketName);
addr = (sockaddr *) xServerAddrUNIX; addr = (sockaddr *) xServerAddrUNIX;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment