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

Fix for BUG#8351 (5.0) - Double quote in Boolean Fulltext query causes crash

Browse Source
This commit is contained in:
svoj@mysql.com
2005-03-04 16:10:41 +04:00
parent dfba6f4e9b
commit efa1092c2e
4 changed files with 61 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
myisam/ft_parser.c
View File

@ -98,6 +98,7 @@ my_bool ft_boolean_check_syntax_string(const byte *str)
* 1 - word found
* 2 - left bracket
* 3 - right bracket
* 4 - stopword found
*/
byte ft_get_word(CHARSET_INFO *cs, byte **start, byte *end,
FT_WORD *word, FTB_PARAM *param)
@ -161,6 +162,11 @@ byte ft_get_word(CHARSET_INFO *cs, byte **start, byte *end,
*start=doc;
return 1;
}
else if (length)
{
*start= doc;
return 4;
}
}
if (param->quot)
{
@ -170,18 +176,19 @@ byte ft_get_word(CHARSET_INFO *cs, byte **start, byte *end,
return 0;
}
byte ft_simple_get_word(CHARSET_INFO *cs, byte **start, byte *end,
FT_WORD *word)
byte ft_simple_get_word(CHARSET_INFO *cs, byte **start, const byte *end,
FT_WORD *word, my_bool skip_stopwords)
{
byte *doc= *start;
uint mwc, length, mbl;
DBUG_ENTER("ft_simple_get_word");
while (doc<end)
do
{
for (;doc<end;doc++)
for (;; doc++)
{
if (true_word_char(cs,*doc)) break;
if (doc >= end) DBUG_RETURN(0);
if (true_word_char(cs, *doc)) break;
}
mwc= length= 0;
@ -193,13 +200,15 @@ byte ft_simple_get_word(CHARSET_INFO *cs, byte **start, byte *end,
word->len= (uint)(doc-word->pos) - mwc;
if (length >= ft_min_word_len && length < ft_max_word_len &&
!is_stopword(word->pos, word->len))
if (skip_stopwords == FALSE ||
(length >= ft_min_word_len && length < ft_max_word_len &&
!is_stopword(word->pos, word->len)))
{
*start= doc;
DBUG_RETURN(1);
}
}
while (doc < end);
DBUG_RETURN(0);
}
@ -217,7 +226,7 @@ int ft_parse(TREE *wtree, byte *doc, int doclen, my_bool with_alloc)
FT_WORD w;
DBUG_ENTER("ft_parse");
while (ft_simple_get_word(wtree->custom_arg, &doc,end,&w))
while (ft_simple_get_word(wtree->custom_arg, &doc, end, &w, TRUE))
{
if (with_alloc)
{