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

ccd0c39c · Vicențiu Ciorbaru · Sergei Golubchik · 84a2f06f · ccd0c39c
Commit ccd0c39c authored Oct 18, 2013 by Vicențiu Ciorbaru Committed by Sergei Golubchik Oct 18, 2013
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

sql/sql_acl.cc sql/sql_acl.cc +3 -4

No files found.
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -5469,11 +5469,10 @@ bool check_grant(THD *thd, ulong want_access, TABLE_LIST *tables,
    if (!(~tl->grant.privilege & want_access))
      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) |
-                        tl->grant.privilege))
+                        tl->grant.privilege)))
    {
-      want_access &= ~(grant_table->cols | tl->grant.privilege);
      goto err;                                 // impossible
    }
  }