generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-28 19:52:00 +01:00
Code Issues Projects Releases Wiki Activity

Problem: unreachable code in zap_client_t

Browse Source 
Solution: replaced unreachable code by assertions and adapted uses
This commit is contained in:
sigiesec
2017-08-17 12:54:05 +02:00
parent 7f15e6c868
commit f9985708b7
10 changed files with 45 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/null_mechanism.cpp
View File

@@ -74,11 +74,9 @@ int zmq::null_mechanism_t::next_handshake_command (msg_t *msg_)
errno = EAGAIN;
return -1;
}
int rc = send_zap_request ();
if (rc != 0)
return -1;
send_zap_request ();
zap_request_sent = true;
rc = receive_and_process_zap_reply ();
int rc = receive_and_process_zap_reply ();
if (rc == -1 || rc == 1)
return -1;
zap_reply_received = true;
@@ -189,8 +187,8 @@ zmq::mechanism_t::status_t zmq::null_mechanism_t::status () const
return handshaking;
}
int zmq::null_mechanism_t::send_zap_request ()
void zmq::null_mechanism_t::send_zap_request ()
{
return zap_client_t::send_zap_request ("NULL", 4, NULL, NULL, 0);
zap_client_t::send_zap_request ("NULL", 4, NULL, NULL, 0);
}