database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Fix for MDEV-140, LPBug#930145 - broken SSL connectivity for some connectors

Browse Source
This commit is contained in:
Vladislav Vaintroub
2012-02-11 14:57:44 +01:00
parent 81690cf326 b3e15f8389
commit e2cb03c980
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
sql/sql_acl.cc
View File

@ -7493,22 +7493,9 @@ static ulong parse_client_handshake_packet(MPVIO_EXT *mpvio,
ulong client_capabilities= uint2korr(net->read_pos); ulong client_capabilities= uint2korr(net->read_pos);
if (client_capabilities & CLIENT_PROTOCOL_41) if (client_capabilities & CLIENT_PROTOCOL_41)
{ {
if (pkt_len < 32) if (pkt_len < 4)
return packet_error; return packet_error;
client_capabilities|= ((ulong) uint2korr(net->read_pos+2)) << 16; client_capabilities|= ((ulong) uint2korr(net->read_pos+2)) << 16;
thd->max_client_packet_length= uint4korr(net->read_pos+4);
DBUG_PRINT("info", ("client_character_set: %d", (uint) net->read_pos[8]));
if (thd_init_client_charset(thd, (uint) net->read_pos[8]))
return packet_error;
thd->update_charset();
end= (char*) net->read_pos+32;
}
else
{
if (pkt_len < 5)
return packet_error;
thd->max_client_packet_length= uint3korr(net->read_pos+2);
end= (char*) net->read_pos+5;
} }
/* Disable those bits which are not supported by the client. */ /* Disable those bits which are not supported by the client. */
@ -7543,6 +7530,25 @@ static ulong parse_client_handshake_packet(MPVIO_EXT *mpvio,
} }
} }
if (client_capabilities & CLIENT_PROTOCOL_41)
{
if (pkt_len < 32)
return packet_error;
thd->max_client_packet_length= uint4korr(net->read_pos+4);
DBUG_PRINT("info", ("client_character_set: %d", (uint) net->read_pos[8]));
if (thd_init_client_charset(thd, (uint) net->read_pos[8]))
return packet_error;
thd->update_charset();
end= (char*) net->read_pos+32;
}
else
{
if (pkt_len < 5)
return packet_error;
thd->max_client_packet_length= uint3korr(net->read_pos+2);
end= (char*) net->read_pos+5;
}
if (end >= (char*) net->read_pos+ pkt_len +2) if (end >= (char*) net->read_pos+ pkt_len +2)
return packet_error; return packet_error;