hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made function parameters constant and added debug checks

Browse Source 
The number of written characters is now checked and should be lower than
compared bytes. The parameters to the dbusers.c query functions are now const
where possible.
This commit is contained in:
Markus Makela
2016-02-16 11:13:30 +02:00
parent c4bcc4ce88
commit 6da0446df0
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
server/core/dbusers.c
View File

@ -148,15 +148,16 @@ static int wildcard_db_grant(char* str);
* MAX_QUERY_STR_LEN bytes long * MAX_QUERY_STR_LEN bytes long
* @return Users query with databases included * @return Users query with databases included
*/ */
static char* get_users_db_query(char* server_version, bool include_root, char* buffer) static char* get_users_db_query(const char* server_version, bool include_root, char* buffer)
{ {
const char* password = strstr(server_version, "5.7.") ? const char* password = strstr(server_version, "5.7.") ?
MYSQL57_PASSWORD : MYSQL_PASSWORD; MYSQL57_PASSWORD : MYSQL_PASSWORD;
snprintf(buffer, MAX_QUERY_STR_LEN, MYSQL_USERS_DB_QUERY_TEMPLATE int nchars = snprintf(buffer, MAX_QUERY_STR_LEN, MYSQL_USERS_DB_QUERY_TEMPLATE
"%s" MYSQL_USERS_ORDER_BY, password, password, "%s" MYSQL_USERS_ORDER_BY, password, password,
include_root ? "" : USERS_QUERY_NO_ROOT); include_root ? "" : USERS_QUERY_NO_ROOT);
ss_dassert(nchars < MAX_QUERY_STR_LEN);
(void) nchars;
return buffer; return buffer;
} }
@ -169,15 +170,16 @@ static char* get_users_db_query(char* server_version, bool include_root, char* b
* MAX_QUERY_STR_LEN bytes long * MAX_QUERY_STR_LEN bytes long
* @return Users query * @return Users query
*/ */
static char* get_users_query(char* server_version, bool include_root, char* buffer) static char* get_users_query(const char* server_version, bool include_root, char* buffer)
{ {
const char* password = strstr(server_version, "5.7.") ? const char* password = strstr(server_version, "5.7.") ?
MYSQL57_PASSWORD : MYSQL_PASSWORD; MYSQL57_PASSWORD : MYSQL_PASSWORD;
snprintf(buffer, MAX_QUERY_STR_LEN, MYSQL_USERS_QUERY_TEMPLATE "%s" int nchars = snprintf(buffer, MAX_QUERY_STR_LEN, MYSQL_USERS_QUERY_TEMPLATE "%s"
MYSQL_USERS_ORDER_BY, password, password, MYSQL_USERS_ORDER_BY, password, password,
include_root ? "" : USERS_QUERY_NO_ROOT); include_root ? "" : USERS_QUERY_NO_ROOT);
ss_dassert(nchars < MAX_QUERY_STR_LEN);
(void) nchars;
return buffer; return buffer;
} }
@ -189,16 +191,17 @@ static char* get_users_query(char* server_version, bool include_root, char* buff
* MAX_QUERY_STR_LEN bytes long * MAX_QUERY_STR_LEN bytes long
* @return User count query * @return User count query
* */ * */
static char* get_usercount_query(char* server_version, bool include_root, char* buffer) static char* get_usercount_query(const char* server_version, bool include_root, char* buffer)
{ {
const char* password = strstr(server_version, "5.7.") ? const char* password = strstr(server_version, "5.7.") ?
MYSQL57_PASSWORD : MYSQL_PASSWORD; MYSQL57_PASSWORD : MYSQL_PASSWORD;
snprintf(buffer, MAX_QUERY_STR_LEN, MYSQL_USERS_COUNT_TEMPLATE_START int nchars = snprintf(buffer, MAX_QUERY_STR_LEN, MYSQL_USERS_COUNT_TEMPLATE_START
MYSQL_USERS_DB_QUERY_TEMPLATE "%s" MYSQL_USERS_ORDER_BY MYSQL_USERS_DB_QUERY_TEMPLATE "%s" MYSQL_USERS_ORDER_BY
MYSQL_USERS_COUNT_TEMPLATE_END, password, password, MYSQL_USERS_COUNT_TEMPLATE_END, password, password,
include_root ? "" : USERS_QUERY_NO_ROOT); include_root ? "" : USERS_QUERY_NO_ROOT);
ss_dassert(nchars < MAX_QUERY_STR_LEN);
(void) nchars;
return buffer; return buffer;
} }