mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-20 07:15:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

MDEV-18350 Using audit plugin with MySQL, mysqld crashes when running COM_INIT_DB against invalid database.

Browse source 
mysql_event_general structure changed in 10.3.
the database_length should be size_t now instead of the int.
This commit is contained in:
Alexey Botchkov 2019-07-26 08:44:43 +04:00
commit 51d58f566a
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugin/server_audit/server_audit.c
View file

@ -15,7 +15,7 @@
#define PLUGIN_VERSION 0x104
#define PLUGIN_STR_VERSION "1.4.7"
#define PLUGIN_STR_VERSION "1.4.8"
#define _my_thread_var loc_thread_var
@ -2260,7 +2260,7 @@ static void auditing_v13(MYSQL_THD thd, unsigned int *ev_v0)
}
int get_db_mysql57(MYSQL_THD thd, char **name, int *len)
int get_db_mysql57(MYSQL_THD thd, char **name, size_t *len)
{
int db_off;
int db_len_off;
@ -2287,7 +2287,7 @@ int get_db_mysql57(MYSQL_THD thd, char **name, int *len)
#ifdef __linux__
*name= *(char **) (((char *) thd) + db_off);
*len= *((int *) (((char*) thd) + db_len_off));
*len= *((size_t *) (((char*) thd) + db_len_off));
if (*name && (*name)[*len] != 0)
return 1;
return 0;

4
plugin/server_audit/test_audit_v4.c
View file

@ -16,7 +16,7 @@ enum enum_server_command{ SERVCOM_A, SERVCOM_B };
#include "plugin_audit_v4.h"
extern void auditing(MYSQL_THD thd, unsigned int event_class, const void *ev);
extern int get_db_mysql57(MYSQL_THD thd, char **name, int *len);
extern int get_db_mysql57(MYSQL_THD thd, char **name, size_t *len);
struct mysql_event_general_302
@ -35,7 +35,7 @@ struct mysql_event_general_302
unsigned long long general_rows;
unsigned long long query_id;
char *database;
int database_length;
size_t database_length;
};