Merge pull request #923 from hintjens/master

Revert "Fixed potential SEGFAULT."

Merge pull request #923 from hintjens/master
Revert "Fixed potential SEGFAULT."
72c02b15 · Ian Barber · a5e397a5 · b1e74f79 · 72c02b15
Commit 72c02b15 authored Mar 14, 2014 by Ian Barber
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

socket_base.cpp src/socket_base.cpp +2 -5

No files found.
--- a/src/socket_base.cpp
+++ b/src/socket_base.cpp
@@ -121,13 +121,10 @@ zmq::socket_base_t *zmq::socket_base_t::create (int type_, class ctx_t *parent_,
            errno = EINVAL;
            return NULL;
    }
-    alloc_assert (s);

-    if (s->mailbox.get_fd () == -1)
-    {
-        delete s;
+    alloc_assert (s);
+    if (s->mailbox.get_fd () == retired_fd)
        return NULL;
-    }

    return s;
 }