Commit c31c54c1 authored by Ulrich Sibiller's avatar Ulrich Sibiller

Loop.cpp: delete passed object prior to overwriting it

parent c48748ba
...@@ -3141,6 +3141,9 @@ int InitBeforeNegotiation() ...@@ -3141,6 +3141,9 @@ int InitBeforeNegotiation()
// Get ready to open the local display. // Get ready to open the local display.
// //
delete xServerAddr;
xServerAddr = NULL;
SetupDisplaySocket(xServerAddrFamily, xServerAddr, xServerAddrLength); SetupDisplaySocket(xServerAddrFamily, xServerAddr, xServerAddrLength);
} }
...@@ -3780,13 +3783,13 @@ void SetupUnixSocket() ...@@ -3780,13 +3783,13 @@ void SetupUnixSocket()
// The following is a dumb copy-paste. The // The following is a dumb copy-paste. The
// nxcompsh library should offer a better // nxcompsh library should offer a better
// implementation. // implementation.
// addr is assumed to have been freed outside
// //
void SetupDisplaySocket(int &addr_family, sockaddr *&addr, void SetupDisplaySocket(int &addr_family, sockaddr *&addr,
unsigned int &addr_length) unsigned int &addr_length)
{ {
addr_family = AF_INET; addr_family = AF_INET;
addr = NULL;
addr_length = 0; addr_length = 0;
char *display; char *display;
......
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