sql_table.cc key length limit check disabled for FULLTEXT

ft_parser.c	Nasty buffer overflow fixed


myisam/ft_parser.c:
  Nasty buffer overflow fixed
sql/sql_table.cc:
  key length limit check disabled for FULLTEXT

1 files changed, 4 insertions, 3 deletions

diff --git a/myisam/ft_parser.c b/myisam/ft_parser.c
index 5f5159a57dd..838901bf049 100644
--- a/myisam/ft_parser.c
+++ b/myisam/ft_parser.c
@@ -1,15 +1,15 @@
 /* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
@@ -141,6 +141,7 @@ TREE * ft_parse(TREE *wtree, byte *doc, int doclen)
     for (w.pos=doc; doc<end; doc++)
       if (!word_char(*doc)) break;
     if ((w.len= (uint) (doc-w.pos)) < MIN_WORD_LEN) continue;
+    if (w.len >= HA_FT_MAXLEN) continue;
     if (!tree_insert(wtree, &w, 0))
     {
       delete_tree(wtree);