diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-21 20:41:24 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-21 20:41:24 +0300 |
| commit | 4d21a145de11eaff28f98fe4ebed56a803450ce0 (patch) | |
| tree | 5c4b00b96e189e3492de198c4080265e81efc832 /sql/sql_show.cc | |
| parent | 4f59f9078fd9af1e958f4a30788084598053bf50 (diff) | |
| parent | 059a5f11711fd502982abed8781faf9f255fa975 (diff) | |
| download | mariadb-git-bb-10.6-MDEV-26769.tar.gz | |
Merge 10.6bb-10.6-MDEV-26769
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 663670794c6..b706829451d 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -4479,7 +4479,9 @@ make_table_name_list(THD *thd, Dynamic_array<LEX_CSTRING*> *table_names, if (!lookup_field_vals->wild_table_value && lookup_field_vals->table_value.str) { - if (lookup_field_vals->table_value.length > NAME_LEN) + if (check_table_name(lookup_field_vals->table_value.str, + lookup_field_vals->table_value.length, + false)) { /* Impossible value for a table name, @@ -4516,6 +4518,9 @@ make_table_name_list(THD *thd, Dynamic_array<LEX_CSTRING*> *table_names, return (schema_tables_add(thd, table_names, lookup_field_vals->table_value.str)); + if (check_db_name((LEX_STRING*)db_name)) + return 0; // Impossible TABLE_SCHEMA name + find_files_result res= find_files(thd, table_names, db_name, path, &lookup_field_vals->table_value); if (res != FIND_FILES_OK) |