database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-24 19:42:23 +03:00
Code Activity

Renamed variables in init_role_grant_pair to make the code more

Browse Source 
consistent.
This commit is contained in:
Vicențiu Ciorbaru
2013-10-17 15:09:39 -07:00
committed by Sergei Golubchik
parent 2f94e542bd
commit df53ed13ac
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
sql/sql_acl.cc
View File

@ -552,35 +552,35 @@ static uchar* acl_role_map_get_key(ROLE_GRANT_PAIR *entry, size_t *length,
static void init_role_grant_pair(MEM_ROOT *mem, ROLE_GRANT_PAIR *entry, static void init_role_grant_pair(MEM_ROOT *mem, ROLE_GRANT_PAIR *entry,
char *username, char *hostname, char *rolename) char *username, char *hostname, char *rolename)
{ {
size_t len[3] = {username ? strlen(username) : 0, size_t uname_l = username ? strlen(username) : 0;
hostname ? strlen(hostname) : 0, size_t hname_l = hostname ? strlen(hostname) : 0;
rolename ? strlen(rolename) : 0}; size_t rname_l = rolename ? strlen(rolename) : 0;
/* /*
Create a buffer that holds all 3 NULL terminated strings in succession Create a buffer that holds all 3 NULL terminated strings in succession
To save memory space, the same buffer is used as the hashkey To save memory space, the same buffer is used as the hashkey
*/ */
size_t bufflen = len[0] + len[1] + len[2] + 3; //add the '\0' aswell size_t bufflen = uname_l + hname_l + rname_l + 3; //add the '\0' aswell
char *buff= (char *)alloc_root(mem, bufflen); char *buff= (char *)alloc_root(mem, bufflen);
/* /*
Offsets in the buffer for all 3 strings Offsets in the buffer for all 3 strings
*/ */
char *username_pos= buff; char *username_pos= buff;
char *hostname_pos= buff + len[0] + 1; char *hostname_pos= buff + uname_l + 1;
char *rolename_pos= buff + len[0] + len[1] + 2; char *rolename_pos= buff + uname_l + hname_l + 2;
if (username) if (username) //prevent undefined behaviour
memcpy(username_pos, username, len[0]); memcpy(username_pos, username, uname_l);
username_pos[len[0]]= '\0'; //#1 string terminator username_pos[uname_l]= '\0'; //#1 string terminator
entry->u_uname= username_pos; entry->u_uname= username_pos;
if (hostname) if (hostname) //prevent undefined behaviour
memcpy(hostname_pos, hostname, len[1]); memcpy(hostname_pos, hostname, hname_l);
hostname_pos[len[1]]= '\0'; //#2 string terminator hostname_pos[hname_l]= '\0'; //#2 string terminator
entry->u_hname= hostname_pos; entry->u_hname= hostname_pos;
if (rolename) if (rolename) //prevent undefined behaviour
memcpy(rolename_pos, rolename, len[2]); memcpy(rolename_pos, rolename, rname_l);
rolename_pos[len[2]]= '\0'; //#3 string terminator rolename_pos[rname_l]= '\0'; //#3 string terminator
entry->r_uname= rolename_pos; entry->r_uname= rolename_pos;
entry->hashkey.str = buff; entry->hashkey.str = buff;