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

MDEV-13650 Backport fix for MDEV-13060 (crash when both AWS plugin and server_audit are loaded) to 10.1

Browse Source 
MDEV-13060 Server Audit Plugin Crashes with AWS KMS plugin

don't do auditing if thd is NULL.

Collaterals:
* copy-paste bugs server_audit.c
This commit is contained in:
Sergei Golubchik
2017-06-26 20:06:12 +02:00
parent df24f8469d
commit 7e56e9ea77
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugin/server_audit/server_audit.c
View File

@@ -1145,7 +1145,7 @@ static void setup_connection_initdb(struct connection_info *cn,
}
else
{
get_str_n(cn->user, &cn->user_length, sizeof(cn->db),
get_str_n(cn->user, &cn->user_length, sizeof(cn->user),
uh_buffer, user_len);
get_str_n(cn->host, &cn->host_length, sizeof(cn->host),
uh_buffer+user_len+1, host_len);
@@ -1196,7 +1196,7 @@ static void setup_connection_query(struct connection_info *cn,
}
else
{
get_str_n(cn->user, &cn->user_length, sizeof(cn->db),
get_str_n(cn->user, &cn->user_length, sizeof(cn->user),
uh_buffer, user_len);
get_str_n(cn->host, &cn->host_length, sizeof(cn->host),
uh_buffer+user_len+1, host_len);
@@ -1956,7 +1956,7 @@ void auditing(MYSQL_THD thd, unsigned int event_class, const void *ev)
/* That one is important as this function can be called with */
/* &lock_operations locked when the server logs an error reported */
/* by this plugin. */
if (internal_stop_logging)
if (!thd || internal_stop_logging)
return;
flogger_mutex_lock(&lock_operations);