Merge pull request #881 from hintjens/master

Revert "Fix potential memory leak"
This commit is contained in:
Ian Barber 2014-02-11 17:38:23 +00:00
commit 6150812ff1

View File

@ -123,10 +123,8 @@ zmq::socket_base_t *zmq::socket_base_t::create (int type_, class ctx_t *parent_,
}
alloc_assert (s);
if (s->mailbox.get_fd () == retired_fd) {
delete s;
if (s->mailbox.get_fd () == retired_fd)
return NULL;
}
return s;
}