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

NULL: Correct ERROR command format

Browse Source
This commit is contained in:
Martin Hurton
2014-05-14 06:50:47 +02:00
parent 164ff4be6b
commit dd6a4fe806
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/null_mechanism.cpp
View File

@@ -78,13 +78,12 @@ int zmq::null_mechanism_t::next_handshake_command (msg_t *msg_)
if (zap_reply_received if (zap_reply_received
&& strncmp (status_code, "200", sizeof status_code) != 0) { && strncmp (status_code, "200", sizeof status_code) != 0) {
const int rc = msg_->init_size (6 + 1 + sizeof status_code); const int rc = msg_->init_size (6 + sizeof status_code);
zmq_assert (rc == 0); zmq_assert (rc == 0);
unsigned char *msg_data = unsigned char *msg_data =
static_cast <unsigned char *> (msg_->data ()); static_cast <unsigned char *> (msg_->data ());
memcpy (msg_data, "\5ERROR", 6); memcpy (msg_data, "\5ERROR", 6);
msg_data [6] = sizeof status_code; memcpy (msg_data + 6, status_code, sizeof status_code);
memcpy (msg_data + 7, status_code, sizeof status_code);
error_command_sent = true; error_command_sent = true;
return 0; return 0;
} }
@@ -164,16 +163,12 @@ int zmq::null_mechanism_t::process_ready_command (
int zmq::null_mechanism_t::process_error_command ( int zmq::null_mechanism_t::process_error_command (
const unsigned char *cmd_data, size_t data_size) const unsigned char *cmd_data, size_t data_size)
{ {
const size_t error_reason_len = data_size - 6;
if (error_reason_len < 1 || error_reason_len > 255) {
errno = EPROTO;
return -1;
}
error_command_received = true; error_command_received = true;
if (data_size == 6) {
errno = EPROTO;
return -1;
}
const size_t size = static_cast <size_t> (cmd_data [6]);
if (6 + 1 + size != data_size) {
errno = EPROTO;
return -1;
}
return 0; return 0;
} }