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

avoid dereferencing uint32_t on unaligned address

Browse Source
This commit is contained in:
KIU Shueng Chuan 2015-09-08 17:26:31 +08:00
parent 734a73c63d
commit 25a50ca0d5
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/socket_base.cpp
View File

@ -1583,23 +1583,12 @@ void zmq::socket_base_t::monitor_event (int event_, int value_, const std::strin
// Send event in first frame // Send event in first frame
zmq_msg_t msg; zmq_msg_t msg;
zmq_msg_init_size (&msg, 6); zmq_msg_init_size (&msg, 6);
#ifdef ZMQ_HAVE_HPUX
// avoid SIGBUS
union {
uint8_t data[6];
struct {
uint16_t event;
uint32_t value;
} v;
} u;
u.v.event = event_;
u.v.value = value_;
memcpy(zmq_msg_data (&msg), u.data, 6);
#else
uint8_t *data = (uint8_t *) zmq_msg_data (&msg); uint8_t *data = (uint8_t *) zmq_msg_data (&msg);
*(uint16_t *) (data + 0) = (uint16_t) event_; // Avoid dereferencing uint32_t on unaligned address
*(uint32_t *) (data + 2) = (uint32_t) value_; uint16_t event = (uint16_t) event_;
#endif uint32_t value = (uint32_t) value_;
memcpy (data + 0, &event, sizeof(event));
memcpy (data + 2, &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