generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-13 18:55:10 +01:00
Code Issues Projects Releases Wiki Activity

zmq_recv() returns size of the message even if it's truncated

Browse Source 
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
This commit is contained in:
Martin Sustrik 2011-03-27 09:50:25 +02:00
parent 82dbef360c
commit 17fdb5e3a8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/zmq.cpp
View File

@ -371,24 +371,24 @@ int zmq_recv (void *s_, void *buf_, size_t len_, int flags_)
int rc = zmq_msg_init (&msg);
errno_assert (rc == 0);
rc = zmq_recvmsg (s_, &msg, flags_);
if (unlikely (rc < 0)) {
int nbytes = zmq_recvmsg (s_, &msg, flags_);
if (unlikely (nbytes < 0)) {
int err = errno;
int rc2 = zmq_msg_close (&msg);
errno_assert (rc2 == 0);
rc = zmq_msg_close (&msg);
errno_assert (rc == 0);
errno = err;
return -1;
}
// At the moment an oversized message is silently truncated.
// TODO: Build in a notification mechanism to report the overflows.
size_t to_copy = size_t (rc) < len_ ? size_t (rc) : len_;
size_t to_copy = size_t (nbytes) < len_ ? size_t (nbytes) : len_;
memcpy (buf_, zmq_msg_data (&msg), to_copy);
rc = zmq_msg_close (&msg);
errno_assert (rc == 0);
return (int) to_copy;
return nbytes;
}
int zmq_sendmsg (void *s_, zmq_msg_t *msg_, int flags_)