hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.3' into 2.4.0

Browse Source
This commit is contained in:
Markus Mäkelä
2019-06-26 09:20:35 +03:00
parent fbd0e84637 67d82146f1
commit d41d4021a8
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/modules/protocol/MySQL/rwbackend.cc
View File

@ -294,6 +294,8 @@ void RWBackend::process_packets(GWBUF* result)
{ {
mxs::Buffer buffer(result); mxs::Buffer buffer(result);
auto it = buffer.begin(); auto it = buffer.begin();
MXB_AT_DEBUG(size_t total_len = buffer.length());
MXB_AT_DEBUG(size_t used_len = 0);
while (it != buffer.end()) while (it != buffer.end())
{ {
@ -303,7 +305,8 @@ void RWBackend::process_packets(GWBUF* result)
len |= (*it++) << 16; len |= (*it++) << 16;
++it; // Skip the sequence ++it; // Skip the sequence
mxb_assert(it != buffer.end()); mxb_assert(it != buffer.end());
mxb_assert(std::distance(it, buffer.end()) >= len); mxb_assert(used_len + len <= total_len);
MXB_AT_DEBUG(used_len += len);
auto end = it; auto end = it;
end.advance(len); end.advance(len);
uint8_t cmd = *it; uint8_t cmd = *it;