Merge branch '2.3' into 2.4.0

2019-06-25 11:46:44 +03:00
parent 82a5d915a8 d8cbdae83d
commit f961bf1d96
6 changed files with 1 additions and 195 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;