database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-07 02:42:49 +03:00
Code Activity

don't warn about the authenticity of client-side errors

Browse Source 
they cannot be sent by the server (ma_net_safe_read() guarantees that)
so they all should be safe and not forged

also, use existing macros to check for error ranges, they are
sufficiently parenthesized to avoid compiler warnings (errors with -Werror)
about "you might want to add parentheses here"
This commit is contained in:
Sergei Golubchik
2023-12-21 18:51:45 +01:00
parent bd87353512
commit 77a2e6ac5d
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libmariadb/mariadb_lib.c
View File

@@ -241,8 +241,7 @@ restart:
} }
goto restart; goto restart;
} }
if (last_errno >= CR_MIN_ERROR && last_errno <= CR_MAX_ERROR || if (IS_MYSQL_ERROR(last_errno) || IS_MARIADB_ERROR(last_errno))
last_errno >= CER_MIN_ERROR && last_errno <= CER_MAX_ERROR)
{ {
/* The server appears to have sent an error code within the /* The server appears to have sent an error code within the
* range(s) of error codes that should only be generated * range(s) of error codes that should only be generated
@@ -1799,16 +1798,20 @@ restart:
*/ */
if ((pkt_length=ma_net_safe_read(mysql)) == packet_error) if ((pkt_length=ma_net_safe_read(mysql)) == packet_error)
{ {
if (mysql->net.last_errno == CR_SERVER_LOST)
unsigned int code= mysql->net.last_errno;
if (code == CR_SERVER_LOST)
my_set_error(mysql, CR_SERVER_LOST, SQLSTATE_UNKNOWN, my_set_error(mysql, CR_SERVER_LOST, SQLSTATE_UNKNOWN,
ER(CR_SERVER_LOST_EXTENDED), ER(CR_SERVER_LOST_EXTENDED),
"handshake: reading initial communication packet", "handshake: reading initial communication packet",
errno); errno);
else if (IS_MYSQL_ERROR(code) || IS_MARIADB_ERROR(code))
; /* not forged - generated on the client side */
else if (mysql->options.use_ssl) else if (mysql->options.use_ssl)
my_set_error(mysql, CR_CONNECTION_ERROR, SQLSTATE_UNKNOWN, my_set_error(mysql, CR_CONNECTION_ERROR, SQLSTATE_UNKNOWN,
"Received error packet before completion of TLS handshake. " "Received error packet before completion of TLS handshake. "
"The authenticity of the following error cannot be verified:\n%d - %s", "The authenticity of the following error cannot be verified:\n%d - %s",
mysql->net.last_errno, mysql->net.last_error); code, mysql->net.last_error);
goto error; goto error;
} }