Commit 6150812f authored by Ian Barber's avatar Ian Barber

Merge pull request #881 from hintjens/master

Revert "Fix potential memory leak"
parents e376ad27 ab9349d3
...@@ -123,10 +123,8 @@ zmq::socket_base_t *zmq::socket_base_t::create (int type_, class ctx_t *parent_, ...@@ -123,10 +123,8 @@ zmq::socket_base_t *zmq::socket_base_t::create (int type_, class ctx_t *parent_,
} }
alloc_assert (s); alloc_assert (s);
if (s->mailbox.get_fd () == retired_fd) { if (s->mailbox.get_fd () == retired_fd)
delete s;
return NULL; return NULL;
}
return s; return s;
} }
......
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