summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2016-12-20 13:03:45 +0200
committerMonty <monty@mariadb.org>2017-01-11 09:18:35 +0200
commited0bc17bee591599c988df21b8d5a264f08eb885 (patch)
treeb0ecffbdd161e067a10096b3a55099adb2164e0f /sql/sql_acl.cc
parente80ad58de8bce0923b91c08d12959c42e9e213a5 (diff)
downloadmariadb-git-ed0bc17bee591599c988df21b8d5a264f08eb885.tar.gz
Removed usage of my_hash_search() with uninitialized HASH.
- Not documented on intened usage - Extra checking takes time for all HASH usage
Diffstat (limited to 'sql/sql_acl.cc')
-rw-r--r--sql/sql_acl.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index ce7de2ed72b..d2840a81e7e 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -4365,6 +4365,8 @@ table_hash_search(const char *host, const char *ip, const char *db,
static GRANT_COLUMN *
column_hash_search(GRANT_TABLE *t, const char *cname, uint length)
{
+ if (!my_hash_inited(&t->hash_columns))
+ return (GRANT_COLUMN*) 0;
return (GRANT_COLUMN*) my_hash_search(&t->hash_columns,
(uchar*) cname, length);
}