diff options
Diffstat (limited to 'sql-common/my_user.c')
| -rw-r--r-- | sql-common/my_user.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sql-common/my_user.c b/sql-common/my_user.c index fa5b80413bf..d6f2818ad77 100644 --- a/sql-common/my_user.c +++ b/sql-common/my_user.c @@ -15,7 +15,7 @@ #include <my_user.h> #include <m_string.h> - +#include <mysql_com.h> /* Parse user value to user name and host name parts. @@ -31,9 +31,9 @@ host_name_len [OUT] A place to store length of the host name part. */ -void parse_user(const char *user_id_str, uint user_id_len, - char *user_name_str, uint *user_name_len, - char *host_name_str, uint *host_name_len) +void parse_user(const char *user_id_str, size_t user_id_len, + char *user_name_str, size_t *user_name_len, + char *host_name_str, size_t *host_name_len) { char *p= strrchr(user_id_str, '@'); @@ -47,6 +47,12 @@ void parse_user(const char *user_id_str, uint user_id_len, *user_name_len= p - user_id_str; *host_name_len= user_id_len - *user_name_len - 1; + if (*user_name_len > USERNAME_LENGTH) + *user_name_len= USERNAME_LENGTH; + + if (*host_name_len > HOSTNAME_LENGTH) + *host_name_len= HOSTNAME_LENGTH; + memcpy(user_name_str, user_id_str, *user_name_len); memcpy(host_name_str, p + 1, *host_name_len); } |