3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-16 20:41:18 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #574 from pijyoi/master

Browse Source 
fix memory leak in ipc_listener wildcard
This commit is contained in:
Ian Barber 2013-06-15 01:27:38 -07:00
commit 1195092c61
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ipc_listener.cpp
View File

@ -119,19 +119,24 @@ int zmq::ipc_listener_t::get_address (std::string &addr_)
int zmq::ipc_listener_t::set_address (const char *addr_) int zmq::ipc_listener_t::set_address (const char *addr_)
{ {
// Create addr on stack for auto-cleanup
std::string addr (addr_);
// Allow wildcard file // Allow wildcard file
if (*addr_ == '*') { if (addr[0] == '*') {
addr_ = tempnam(NULL, NULL); char *tmpstr = tempnam (NULL, NULL);
addr.assign (tmpstr);
free (tmpstr);
} }
// Get rid of the file associated with the UNIX domain socket that // Get rid of the file associated with the UNIX domain socket that
// may have been left behind by the previous run of the application. // may have been left behind by the previous run of the application.
::unlink (addr_); ::unlink (addr.c_str());
filename.clear (); filename.clear ();
// Initialise the address structure. // Initialise the address structure.
ipc_address_t address; ipc_address_t address;
int rc = address.resolve (addr_); int rc = address.resolve (addr.c_str());
if (rc != 0) if (rc != 0)
return -1; return -1;
@ -147,10 +152,10 @@ int zmq::ipc_listener_t::set_address (const char *addr_)
if (rc != 0) if (rc != 0)
goto error; goto error;
filename.assign(addr_); filename.assign (addr.c_str());
has_file = true; has_file = true;
// Listen for incomming connections. // Listen for incoming connections.
rc = listen (s, options.backlog); rc = listen (s, options.backlog);
if (rc != 0) if (rc != 0)
goto error; goto error;