hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #44 from skysql/hint_bugfix

Browse Source 
Fix to bug 475
This commit is contained in:
Vilho Raatikka
2014-09-10 17:24:26 +03:00
parent 025f920ddb 6196dfb050
commit 11166e2f08
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
server/modules/filter/hint/hintparser.c
View File

@ -261,6 +261,11 @@ HINT_MODE mode = HM_EXECUTE;
hint_pop(session); hint_pop(session);
state = HS_INIT; state = HS_INIT;
break; break;
case TOK_START:
hintname = NULL;
mode = HM_START;
state = HS_INIT;
break;
default: default:
/* Error: expected hint, name or STOP */ /* Error: expected hint, name or STOP */
LOGIF(LT, (skygw_log_write( LOGIF(LT, (skygw_log_write(
@ -441,7 +446,7 @@ HINT_MODE mode = HM_EXECUTE;
/* /*
* We are starting either a predefined set of hints, * We are starting either a predefined set of hints,
* creating a new set of hints and starting in a single * creating a new set of hints and starting in a single
* operation or starting an annonymous block of hints. * operation or starting an anonymous block of hints.
*/ */
if (hintname == NULL && rval != NULL) if (hintname == NULL && rval != NULL)
{ {
@ -523,6 +528,7 @@ hint_next_token(GWBUF **buf, char **ptr)
{ {
char word[100], *dest; char word[100], *dest;
int inword = 0; int inword = 0;
int endtag = 0;
char inquote = '\0'; char inquote = '\0';
int i, found; int i, found;
HINT_TOKEN *tok; HINT_TOKEN *tok;
@ -553,6 +559,18 @@ HINT_TOKEN *tok;
else if (**ptr == '\'') else if (**ptr == '\'')
inquote = **ptr; inquote = **ptr;
/** Any other character which belongs to the word, move ahead */ /** Any other character which belongs to the word, move ahead */
else if(**ptr == '/' && endtag)
{
/** Comment end tag found, rewind the pointer back and return the token */
inword = 0;
(*ptr)--;
break;
}
else if(**ptr == '*' && !endtag)
{
endtag = 1;
}
else if (inword || (isspace(**ptr) == 0)) else if (inword || (isspace(**ptr) == 0))
{ {
*dest++ = **ptr; *dest++ = **ptr;
@ -574,7 +592,7 @@ HINT_TOKEN *tok;
/* We now have a word in the local word, check to see if it is a /* We now have a word in the local word, check to see if it is a
* token we recognise. * token we recognise.
*/ */
if (word[0] == '\0') if (word[0] == '\0' || (word[0] == '*' && word[1] == '/'))
{ {
tok->token = TOK_EOL; tok->token = TOK_EOL;
return tok; return tok;
@ -749,4 +767,4 @@ HINTSTACK* free_hint_stack(
{ {
return NULL; return NULL;
} }
} }