Skip to content

Problem: monitor_t incorrectly deletes socket_t move assignment operator #304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sigiesec merged 1 commit into from
Apr 4, 2019
Merged

Problem: monitor_t incorrectly deletes socket_t move assignment operator #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions tests/monitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,51 @@ TEST_CASE("monitor create destroy", "[monitor]")
}

#if defined(ZMQ_CPP11)
TEST_CASE("monitor move construct", "[monitor]")
{
zmq::context_t ctx;
zmq::socket_t sock(ctx, ZMQ_DEALER);
SECTION("move ctor empty")
{
zmq::monitor_t monitor1;
zmq::monitor_t monitor2 = std::move(monitor1);
}
SECTION("move ctor init")
{
zmq::monitor_t monitor1;
monitor1.init(sock, "inproc://monitor-client");
zmq::monitor_t monitor2 = std::move(monitor1);
}
}

TEST_CASE("monitor move assign", "[monitor]")
{
zmq::context_t ctx;
zmq::socket_t sock(ctx, ZMQ_DEALER);
SECTION("move assign empty")
{
zmq::monitor_t monitor1;
zmq::monitor_t monitor2;
monitor1 = std::move(monitor2);
}
SECTION("move assign init")
{
zmq::monitor_t monitor1;
monitor1.init(sock, "inproc://monitor-client");
zmq::monitor_t monitor2;
monitor2 = std::move(monitor1);
}
SECTION("move assign init both")
{
zmq::monitor_t monitor1;
monitor1.init(sock, "inproc://monitor-client");
zmq::monitor_t monitor2;
zmq::socket_t sock2(ctx, ZMQ_DEALER);
monitor2.init(sock2, "inproc://monitor-client2");
monitor2 = std::move(monitor1);
}
}

TEST_CASE("monitor init event count", "[monitor]")
{
common_server_client_setup s{false};
Expand Down
26 changes: 19 additions & 7 deletions zmq.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,14 +821,9 @@ class monitor_t

virtual ~monitor_t()
{
if (socketPtr)
zmq_socket_monitor(socketPtr, ZMQ_NULLPTR, 0);

if (monitor_socket)
zmq_close(monitor_socket);
close();
}


#ifdef ZMQ_HAS_RVALUE_REFS
monitor_t(monitor_t &&rhs) ZMQ_NOTHROW : socketPtr(rhs.socketPtr),
monitor_socket(rhs.monitor_socket)
Expand All @@ -837,7 +832,15 @@ class monitor_t
rhs.monitor_socket = ZMQ_NULLPTR;
}

socket_t &operator=(socket_t &&rhs) ZMQ_DELETED_FUNCTION;
monitor_t &operator=(monitor_t &&rhs) ZMQ_NOTHROW
{
close();
socketPtr = ZMQ_NULLPTR;
monitor_socket = ZMQ_NULLPTR;
std::swap(socketPtr, rhs.socketPtr);
std::swap(monitor_socket, rhs.monitor_socket);
return *this;
}
#endif


Expand Down Expand Up @@ -1113,6 +1116,15 @@ class monitor_t

void *socketPtr;
void *monitor_socket;

void close() ZMQ_NOTHROW
{
if (socketPtr)
zmq_socket_monitor(socketPtr, ZMQ_NULLPTR, 0);

if (monitor_socket)
zmq_close(monitor_socket);
}
};

#if defined(ZMQ_BUILD_DRAFT_API) && defined(ZMQ_CPP11) && defined(ZMQ_HAVE_POLLER)
Expand Down