From 5d16070ffcd426e81ea27520f6847d68e5e5af80 Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Tue, 2 Feb 2010 08:46:35 +0100 Subject: ZMQII-53: Memory leak when using invalid socket type --- src/dispatcher.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/dispatcher.cpp b/src/dispatcher.cpp index 9e713c2..b830654 100644 --- a/src/dispatcher.cpp +++ b/src/dispatcher.cpp @@ -134,11 +134,15 @@ zmq::socket_base_t *zmq::dispatcher_t::create_socket (int type_) } threads_sync.unlock (); + socket_base_t *s = thread->create_socket (type_); + if (!s) + return NULL; + term_sync.lock (); sockets++; term_sync.unlock (); - return thread->create_socket (type_); + return s; } void zmq::dispatcher_t::destroy_socket () -- cgit v1.2.3