summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-06-18 21:28:27 +0200
committerSergei Golubchik <serg@mariadb.org>2018-06-21 10:15:27 +0200
commitaf2dd582e64a6903bee766cd992666da98ca8d69 (patch)
tree1a2137a247947d54369327f4676dcfb7d84be3b8 /sql/sql_acl.cc
parent5f0510225aa149377b8563f6e96b74d05d41f080 (diff)
downloadmariadb-git-af2dd582e64a6903bee766cd992666da98ca8d69.tar.gz
empty password is a valid password, don't crash
Diffstat (limited to 'sql/sql_acl.cc')
-rw-r--r--sql/sql_acl.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index d550aa1feb8..1809e22ffbf 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -3864,7 +3864,8 @@ void set_authentication_plugin_from_password(const User_table& user_table,
const char* password,
uint password_length)
{
- if (password_length == SCRAMBLED_PASSWORD_CHAR_LENGTH)
+ if (password_length == SCRAMBLED_PASSWORD_CHAR_LENGTH ||
+ password_length == 0)
{
user_table.plugin()->store(native_password_plugin_name.str,
native_password_plugin_name.length,