github
/
mysql-audit
mirror of https://github.com/mcafee-enterprise/mysql-audit
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

safe guards regarding checking for record objs. issue #29.

pull/36/head
Guy Lichtman 2013-01-12 10:53:48 +02:00
parent e4871f5305
commit af0a366267
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/audit_handler.h
View File

@ -35,7 +35,8 @@ typedef size_t OFFSET;
#define MAX_COM_STATUS_VARS_RECORDS 512 #define MAX_COM_STATUS_VARS_RECORDS 512
#define MAX_OBJECT_CHAR_NUMBERS 130 //mysql max identifier is 64 so 2*64 + . and null
#define MAX_OBJECT_CHAR_NUMBERS 131
#define MAX_USER_CHAR_NUMBERS 20 #define MAX_USER_CHAR_NUMBERS 20
const char * retrieve_user (THD * thd); const char * retrieve_user (THD * thd);
#define MAX_NUM_OBJECT_ELEM 256 #define MAX_NUM_OBJECT_ELEM 256

10
src/audit_plugin.cc
View File

@ -654,9 +654,12 @@ static void audit(ThdSesData *pThdData)
while (table && !matched) { while (table && !matched) {
char *name = table->get_table_name(); char *name = table->get_table_name();
char *db = table->get_db_name(); char *db = table->get_db_name();
char db_obj[MAX_OBJECT_CHAR_NUMBERS]; char db_obj[MAX_OBJECT_CHAR_NUMBERS] = {0};
char wildcard_obj[MAX_OBJECT_CHAR_NUMBERS]; char wildcard_obj[MAX_OBJECT_CHAR_NUMBERS] = {0};
char db_wildcard[MAX_OBJECT_CHAR_NUMBERS]; char db_wildcard[MAX_OBJECT_CHAR_NUMBERS] = {0};
if(db && name &&
((strlen(db) + strlen(name)) < MAX_OBJECT_CHAR_NUMBERS - 2))
{
strcpy(db_obj, db); strcpy(db_obj, db);
strcat(db_obj, "."); strcat(db_obj, ".");
strcat(db_obj, name); strcat(db_obj, name);
@ -673,6 +676,7 @@ static void audit(ThdSesData *pThdData)
table = table->next_global; table = table->next_global;
} }
} }
}
if (!matched) { if (!matched) {
return; return;
} }