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

Merge for Fix MySQL 5.1 server handshake

Browse Source
This commit is contained in:
MassimilianoPinto
2014-02-21 11:10:14 +01:00
parent e8d68d7271 3bb0d650f8
commit 0e8f29d62a
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/protocol/mysql_common.c
View File

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