Skip to content

L
libzmq
Commit 43f2c6ff authored by Ivo Danihelka's avatar Ivo Danihelka Committed by Martin Sustrik
Browse files
Options

improved null checking in zmq_term

parent b608c19c
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
AUTHORS
View file @ 43f2c6ff
...@@ -15,6 +15,7 @@ Erik Rigtorp <erik@rigtorp.com> ...@@ -15,6 +15,7 @@ Erik Rigtorp <erik@rigtorp.com>
Frank Denis <zeromq@pureftpd.org> Frank Denis <zeromq@pureftpd.org>
George Neill <georgen@neillnet.com> George Neill <georgen@neillnet.com>
Gonzalo Diethelm <gdiethelm@dcv.cl> Gonzalo Diethelm <gdiethelm@dcv.cl>
Ivo Danihelka <ivo@danihelka.net>
Joe Thornber <joe.thornber@gmail.com> Joe Thornber <joe.thornber@gmail.com>
Jon Dyte <jon@totient.co.uk> Jon Dyte <jon@totient.co.uk>
Kamil Shakirov <kamils80@gmail.com> Kamil Shakirov <kamils80@gmail.com>
......
src/zmq.cpp
View file @ 43f2c6ff
...@@ -269,13 +269,14 @@ void *zmq_init (int io_threads_) ...@@ -269,13 +269,14 @@ void *zmq_init (int io_threads_)
int zmq_term (void *ctx_) int zmq_term (void *ctx_)
{ {
int rc = ((zmq::ctx_t*) ctx_)->terminate ();
int en = errno;
if (!ctx_) { if (!ctx_) {
errno = EFAULT; errno = EFAULT;
return -1; return -1;
} }
int rc = ((zmq::ctx_t*) ctx_)->terminate ();
int en = errno;
#if defined ZMQ_HAVE_OPENPGM #if defined ZMQ_HAVE_OPENPGM
// Shut down the OpenPGM library. // Shut down the OpenPGM library.
if (pgm_shutdown () != TRUE) if (pgm_shutdown () != TRUE)
......
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