Merge pull request #881 from hintjens/master

Revert "Fix potential memory leak"

Merge pull request #881 from hintjens/master
Revert "Fix potential memory leak"
6150812f · Ian Barber · e376ad27 · ab9349d3 · 6150812f
Commit 6150812f authored Feb 11, 2014 by Ian Barber
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

socket_base.cpp src/socket_base.cpp +1 -3

No files found.
--- a/src/socket_base.cpp
+++ b/src/socket_base.cpp
@@ -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;
 }