Merge pull request #871 from apyrgio/develop

Fix potential segfault/memleak

Merge pull request #871 from apyrgio/develop
Fix potential segfault/memleak
5a47fc4f · Pieter Hintjens · 0ac223c7 · 50d34e56 · 5a47fc4f
Commit 5a47fc4f authored Feb 04, 2014 by Pieter Hintjens
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

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

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

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