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

Problem: The flag that indicates the next expected message gets set even if the send fails (#3270)

Browse Source 
* ZMQ_DGRAM: flip more flag after successful send

In the dgram socket we have a flag that indicates the next expected message type to ensure that always a pair of "address" + "body" messages gets sent. The first one MUST have the sendmore flag, the second MUST NOT.

In case the message does not get sent because of HWM full, then the function returns EAGAIN as it should. But unfortunately the next expected message type-flag gets flipped as well. When the socket_base::send function now tries to resend the message, it became the wrong message type... If you don't stop sending pairs of messages here (like me) then the next message that gets through will be of the wrong type, which in turn crashes the udp_engine function as described in #3268
This commit is contained in:
gabm 2018-10-08 18:14:45 +02:00 committed by Luca Boccassi
parent 501d0815bf
commit c1ac158f50
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/dgram.cpp
View File

@ -106,18 +106,12 @@ int zmq::dgram_t::xsend (msg_t *msg_)
errno = EINVAL;
return -1;
}
// Expect one more message frame.
_more_out = true;
} else {
// dgram messages are two part only, reject part if more is set
if (msg_->flags () & msg_t::more) {
errno = EINVAL;
return -1;
}
// This is the last part of the message.
_more_out = false;
}
// Push the message into the pipe.
@ -129,6 +123,9 @@ int zmq::dgram_t::xsend (msg_t *msg_)
if (!(msg_->flags () & msg_t::more))
_pipe->flush ();
// flip the more flag
_more_out = !_more_out;
// Detach the message from the data buffer.
int rc = msg_->init ();
errno_assert (rc == 0);