Merge branch '2.4.0' into 2.4

2019-06-25 11:48:44 +03:00
parent 1b5071260b 0435da90fb
commit 28a2a726f8
15 changed files with 1 additions and 1090 deletions
--- a/server/modules/protocol/MySQL/rwbackend.cc
+++ b/server/modules/protocol/MySQL/rwbackend.cc
@ -303,6 +303,7 @@ void RWBackend::process_packets(GWBUF* result)
        len |= (*it++) << 16;
        ++it;   // Skip the sequence
        mxb_assert(it != buffer.end());
+        mxb_assert(std::distance(it, buffer.end()) >= len);
        auto end = it;
        end.advance(len);
        uint8_t cmd = *it;