generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-07-03 17:17:14 +02:00
Code Issues Projects Releases Wiki Activity

Problem: magic number "2" in socket_base.cpp

Browse Source 
Solution: calculate from field sizes
This commit is contained in:
Simon Giesecke 2018-05-28 18:45:41 +02:00
parent d75ec5e055
commit a4c817e736
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/socket_base.cpp
View File

@ -1731,14 +1731,14 @@ void zmq::socket_base_t::monitor_event (int event_,
if (_monitor_socket) { if (_monitor_socket) {
// Send event in first frame // Send event in first frame
const uint16_t event = static_cast<uint16_t> (event_);
const uint32_t value = static_cast<uint32_t> (value_);
zmq_msg_t msg; zmq_msg_t msg;
zmq_msg_init_size (&msg, 6); zmq_msg_init_size (&msg, sizeof (event) + sizeof (value));
uint8_t *data = static_cast<uint8_t *> (zmq_msg_data (&msg)); uint8_t *data = static_cast<uint8_t *> (zmq_msg_data (&msg));
// Avoid dereferencing uint32_t on unaligned address // Avoid dereferencing uint32_t on unaligned address
uint16_t event = static_cast<uint16_t> (event_);
uint32_t value = static_cast<uint32_t> (value_);
memcpy (data + 0, &event, sizeof (event)); memcpy (data + 0, &event, sizeof (event));
memcpy (data + 2, &value, sizeof (value)); memcpy (data + sizeof (event), &value, sizeof (value));
zmq_sendmsg (_monitor_socket, &msg, ZMQ_SNDMORE); zmq_sendmsg (_monitor_socket, &msg, ZMQ_SNDMORE);
// Send address in second frame // Send address in second frame