1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed crash caused by dereferencing null pointer. The comparison is no longer necessary there.

Browse Source
This commit is contained in:
Vicențiu Ciorbaru 2013-10-18 05:13:22 -07:00 committed by Sergei Golubchik
parent 84a2f06fb2
commit ccd0c39cf4
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_acl.cc
View File

@ -5469,12 +5469,11 @@ bool check_grant(THD *thd, ulong want_access, TABLE_LIST *tables,
if (!(~tl->grant.privilege & want_access)) if (!(~tl->grant.privilege & want_access))
continue; continue;
if (want_access & ~((grant_table ? grant_table->cols : 0) | if ((want_access&= ~((grant_table ? grant_table->cols : 0) |
(grant_table_role ? grant_table_role->cols : 0) | (grant_table_role ? grant_table_role->cols : 0) |
tl->grant.privilege)) tl->grant.privilege)))
{ {
want_access &= ~(grant_table->cols | tl->grant.privilege); goto err; // impossible
goto err; // impossible
} }
} }
if (locked) if (locked)