database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

sql_table.cc key length limit check disabled for FULLTEXT

Browse Source 
ft_parser.c	Nasty buffer overflow fixed
This commit is contained in:
serg@serg.mysql.com
2000-10-04 17:26:31 +02:00
parent 67dd1d1132
commit 054d7c9abf
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
myisam/ft_parser.c
View File

@ -141,6 +141,7 @@ TREE * ft_parse(TREE *wtree, byte *doc, int doclen)
for (w.pos=doc; doc<end; doc++) for (w.pos=doc; doc<end; doc++)
if (!word_char(*doc)) break; if (!word_char(*doc)) break;
if ((w.len= (uint) (doc-w.pos)) < MIN_WORD_LEN) continue; if ((w.len= (uint) (doc-w.pos)) < MIN_WORD_LEN) continue;
if (w.len >= HA_FT_MAXLEN) continue;
if (!tree_insert(wtree, &w, 0)) if (!tree_insert(wtree, &w, 0))
{ {
delete_tree(wtree); delete_tree(wtree);

2
sql/sql_table.cc
View File

@ -469,7 +469,7 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
} }
} }
key_info->key_length=(uint16) key_length; key_info->key_length=(uint16) key_length;
if (key_length > file->max_key_length()) if (key_length > file->max_key_length() && key->type != Key::FULLTEXT)
{ {
my_error(ER_TOO_LONG_KEY,MYF(0),file->max_key_length()); my_error(ER_TOO_LONG_KEY,MYF(0),file->max_key_length());
DBUG_RETURN(-1); DBUG_RETURN(-1);