Commit b9d83169 authored by Pieter Hintjens's avatar Pieter Hintjens

Merge pull request #1699 from somdoron/master

problem: when socket is destroyed before zmq_poller is the zmq_poller is accessing a dead socket
parents 714988e6 6bbca7cf
......@@ -47,7 +47,7 @@ zmq::socket_poller_t::~socket_poller_t ()
tag = 0xdeadbeef;
for (items_t::iterator it = items.begin(); it != items.end(); ++it) {
if (it->socket) {
if (it->socket && it->socket->check_tag()) {
int thread_safe;
size_t thread_safe_size = sizeof(int);
......@@ -648,5 +648,3 @@ int zmq::socket_poller_t::wait (zmq::socket_poller_t::event_t *event_, long time
return -1;
#endif
}
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