diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-03-14 17:08:42 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-03-14 17:08:42 +0200 |
| commit | 03b0df9481c6f83ab67c1c79d8c6cc2db0ca9223 (patch) | |
| tree | 2c4870b4c69060f127e0c4aca401c4312128a363 /sql/table.cc | |
| parent | f3eb7fe0c3259b001f77c30844f42f96562c23f1 (diff) | |
| download | mariadb-git-03b0df9481c6f83ab67c1c79d8c6cc2db0ca9223.tar.gz | |
Check for empty table/column names
mysql-test/t/create.test:
Test for empty table/column name
tests/grant.pl:
More tests
tests/grant.res:
More tests
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index 3afadec3801..5503dddf085 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1099,6 +1099,8 @@ bool check_db_name(char *name) bool check_table_name(const char *name, uint length) { const char *end= name+length; + if (!length || length > NAME_LEN) + return 1; while (name != end) { @@ -1122,6 +1124,8 @@ bool check_table_name(const char *name, uint length) bool check_column_name(const char *name) { + const char *start= name; + while (*name) { #if defined(USE_MB) && defined(USE_MB_IDENT) @@ -1139,7 +1143,8 @@ bool check_column_name(const char *name) return 1; name++; } - return 0; + /* Error if empty or too long column name */ + return (name == start || (uint) (name - start) > NAME_LEN); } /* |