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

don't hang if the text contains illegal characters

Browse Source
This commit is contained in:
serg@serg.mylan
2004-10-25 10:23:38 +02:00
parent b7a8cce4eb
commit fb232f7e54
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
myisam/ft_parser.c
View File

@ -174,7 +174,7 @@ byte ft_simple_get_word(CHARSET_INFO *cs, byte **start, byte *end,
FT_WORD *word) FT_WORD *word)
{ {
byte *doc= *start; byte *doc= *start;
uint mwc, length; uint mwc, length, mbl;
DBUG_ENTER("ft_simple_get_word"); DBUG_ENTER("ft_simple_get_word");
while (doc<end) while (doc<end)
@ -185,7 +185,7 @@ byte ft_simple_get_word(CHARSET_INFO *cs, byte **start, byte *end,
} }
mwc= length= 0; mwc= length= 0;
for (word->pos=doc; doc<end; length++, doc+=my_mbcharlen(cs, *(uchar *)doc)) for (word->pos=doc; doc<end; length++, mbl=my_mbcharlen(cs, *(uchar *)doc), doc+=(mbl ? mbl : 1))
if (true_word_char(cs,*doc)) if (true_word_char(cs,*doc))
mwc= 0; mwc= 0;
else if (!misc_word_char(*doc) || mwc++) else if (!misc_word_char(*doc) || mwc++)