diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-21 13:41:04 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-21 13:41:04 +0300 |
| commit | e4a7c15dd6ba812ac9a4183dec937513eb68a2bc (patch) | |
| tree | 41954d8a6608a2309994d3bbe09f72c1cc73ce6f /sql/sql_show.cc | |
| parent | 1388845e048011932a6d715936a781479c5e6af3 (diff) | |
| parent | 1a2308d3f443d8fcacf5506cb96f802dee3a3519 (diff) | |
| download | mariadb-git-e4a7c15dd6ba812ac9a4183dec937513eb68a2bc.tar.gz | |
Merge 10.2 into 10.3
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 5a3c27832ac..b2f9fdf87fe 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -4474,7 +4474,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, @@ -4511,6 +4513,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) |