Merge for Fix MySQL 5.1 server handshake

This commit is contained in:
MassimilianoPinto
2014-02-21 11:10:14 +01:00

View File

@ -257,6 +257,7 @@ int gw_decode_mysql_server_handshake(MySQLProtocol *conn, uint8_t *payload) {
payload+=2;
// get scramble len
if (payload[0] > 0) {
scramble_len = payload[0] -1;
ss_dassert(scramble_len > GW_SCRAMBLE_LENGTH_323);
ss_dassert(scramble_len <= GW_MYSQL_SCRAMBLE_SIZE);
@ -265,6 +266,9 @@ int gw_decode_mysql_server_handshake(MySQLProtocol *conn, uint8_t *payload) {
/* log this */
return -2;
}
} else {
scramble_len = GW_MYSQL_SCRAMBLE_SIZE;
}
// skip 10 zero bytes
payload += 11;