3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-17 04:50:57 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #333 from hurtonm/fix_decoder_to_properly_handle_large_messages

Browse Source 
Fix decoder to properly handle large messages
This commit is contained in:
Pieter Hintjens 2012-04-29 22:33:31 -07:00
commit f497aae8df
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/decoder.cpp
View File

@ -21,6 +21,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <limits>
#include "decoder.hpp" #include "decoder.hpp"
#include "session_base.hpp" #include "session_base.hpp"
@ -96,33 +97,41 @@ bool zmq::decoder_t::one_byte_size_ready ()
bool zmq::decoder_t::eight_byte_size_ready () bool zmq::decoder_t::eight_byte_size_ready ()
{ {
// 8-byte size is read. Allocate the buffer for message body and // 8-byte payload length is read. Allocate the buffer
// read the message data into it. // for message body and read the message data into it.
size_t size = (size_t) get_uint64 (tmpbuf); const uint64_t payload_length = get_uint64 (tmpbuf);
// There has to be at least one byte (the flags) in the message). // There has to be at least one byte (the flags) in the message).
if (!size) { if (payload_length == 0) {
decoding_error (); decoding_error ();
return false; return false;
} }
// in_progress is initialised at this point so in theory we should // Message size must not exceed the maximum allowed size.
// close it before calling zmq_msg_init_size, however, it's a 0-byte if (maxmsgsize >= 0 && payload_length - 1 > (uint64_t) maxmsgsize) {
// message and thus we can treat it as uninitialised... decoding_error ();
int rc; return false;
if (maxmsgsize >= 0 && (int64_t) (size - 1) > maxmsgsize) {
rc = -1;
errno = ENOMEM;
} }
else
rc = in_progress.init_size (size - 1); // Message size must fit within range of size_t data type.
if (rc != 0 && errno == ENOMEM) { if (payload_length - 1 > std::numeric_limits <size_t>::max ()) {
decoding_error ();
return false;
}
const size_t msg_size = static_cast <size_t> (payload_length - 1);
// in_progress is initialised at this point so in theory we should
// close it before calling init_size, however, it's a 0-byte
// message and thus we can treat it as uninitialised...
int rc = in_progress.init_size (msg_size);
if (rc != 0) {
errno_assert (errno == ENOMEM);
rc = in_progress.init (); rc = in_progress.init ();
errno_assert (rc == 0); errno_assert (rc == 0);
decoding_error (); decoding_error ();
return false; return false;
} }
errno_assert (rc == 0);
next_step (tmpbuf, 1, &decoder_t::flags_ready); next_step (tmpbuf, 1, &decoder_t::flags_ready);
return true; return true;