1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UBSAN: Fix a bit shift overflow

Browse Source 
Shifting a 16-bit type by 16 bits is undefined behaviour.
The result is at least 32 bits, so let us cast the shift operand
to a wider type before shifting.
This commit is contained in:
Marko Mäkelä 2020-09-23 12:42:30 +03:00
parent af40a2b43e
commit 70960bd33d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql-common/client.c
View File

@ -1,5 +1,5 @@
/* Copyright (c) 2003, 2016, Oracle and/or its affiliates. /* Copyright (c) 2003, 2016, Oracle and/or its affiliates.
Copyright (c) 2009, 2017, MariaDB Copyright (c) 2009, 2020, MariaDB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -3295,7 +3295,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
/* New protocol with 16 bytes to describe server characteristics */ /* New protocol with 16 bytes to describe server characteristics */
mysql->server_language=end[2]; mysql->server_language=end[2];
mysql->server_status=uint2korr(end+3); mysql->server_status=uint2korr(end+3);
mysql->server_capabilities|= uint2korr(end+5) << 16; mysql->server_capabilities|= ((unsigned) uint2korr(end+5)) << 16;
pkt_scramble_len= end[7]; pkt_scramble_len= end[7];
if (pkt_scramble_len < 0) if (pkt_scramble_len < 0)
{ {