generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-11-08 14:56:14 +01:00
Code Issues Projects Releases Wiki Activity

Always mark socket as retired when closing ipc_listener

Browse Source 
When closing an ipc listener, the library may try to unlink
the associated file. When this fails, the underlying
socket is not marked as retired and this triggers
assertion failure.

Fixes issue #397
This commit is contained in:
Martin Hurton
2012-07-12 01:47:36 +02:00
parent 43ee4396cf
commit 62b5b914f5
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ipc_listener.cpp
View File

@@ -171,6 +171,8 @@ int zmq::ipc_listener_t::close ()
int rc = ::close (s); int rc = ::close (s);
errno_assert (rc == 0); errno_assert (rc == 0);
s = retired_fd;
// If there's an underlying UNIX domain socket, get rid of the file it // If there's an underlying UNIX domain socket, get rid of the file it
// is associated with. // is associated with.
if (has_file && !filename.empty ()) { if (has_file && !filename.empty ()) {
@@ -182,7 +184,6 @@ int zmq::ipc_listener_t::close ()
} }
socket->monitor_event (ZMQ_EVENT_CLOSED, endpoint.c_str(), s); socket->monitor_event (ZMQ_EVENT_CLOSED, endpoint.c_str(), s);
s = retired_fd;
return 0; return 0;
} }