generic-library/cppzmq
1
0
Fork 0
mirror of https://github.com/zeromq/cppzmq.git synced 2024-12-12 10:33:52 +01:00
Code Issues Projects Releases Wiki Activity

Bugfix: socket_t move assignment doesn't initialize ctxptr

Browse Source 
Until now, we only assigned the _handle on
`zmq::socket_t::operator=(socket_t&&)`. This manifests when trying to
monitor a socket initialized by that constructor.

To avoid changing the public interface of the socket_t class, we tested
for the specific monitor usecase, since it's the only class accessing
zmq::socke_t::ctxptr.

NOTE: When running the new unit-test without the fix, it might hang on
`zmq_socket_monitor(socket_, NULL, 0)`. We haven't figured out the cause
for that, but we deemed it unimportant (or at least out of scope).
This commit is contained in:
or17191 2020-07-18 19:07:55 +03:00
parent 89f4d1b187
commit 37e6334d5f
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/monitor.cpp
View File

@ -142,4 +142,19 @@ TEST_CASE("monitor init abort", "[monitor]")
monitor.abort();
thread.join();
}
TEST_CASE("monitor from move assigned socket", "[monitor]")
{
zmq::context_t ctx;
zmq::socket_t sock;
sock = std::move([&ctx] {
zmq::socket_t sock(ctx, ZMQ_DEALER);
return sock;
}());
zmq::monitor_t monitor1;
monitor1.init(sock, "inproc://monitor-client");
// On failure, this test might hang indefinitely instead of immediately
// failing
}
#endif

5
zmq.hpp
View File

@ -2103,6 +2103,7 @@ class socket_t : public detail::socket_base
{
close();
std::swap(_handle, rhs._handle);
std::swap(ctxptr, rhs.ctxptr);
return *this;
}
#endif
@ -2121,6 +2122,7 @@ class socket_t : public detail::socket_base
int rc = zmq_close(_handle);
ZMQ_ASSERT(rc == 0);
_handle = ZMQ_NULLPTR;
ctxptr = ZMQ_NULLPTR;
}
void swap(socket_t &other) ZMQ_NOTHROW
@ -2143,6 +2145,9 @@ class socket_t : public detail::socket_base
{
if (_handle == ZMQ_NULLPTR)
throw error_t();
if (ctxptr == ZMQ_NULLPTR)
throw error_t();
}
};