database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-03 22:24:49 +03:00
Code

Prevent recursion during parse of email-like string with multiple '@'.

Browse Source 
Patch by Heikki Linnakangas <heikki.linnakangas@enterprisedb.com>
This commit is contained in:
Teodor Sigaev 2009-03-10 17:44:44 +00:00
parent 20bef2176d
commit 9424b22b5e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/tsearch2/wordparser/parser.c
View File

@ -1,4 +1,4 @@
/* $PostgreSQL: pgsql/contrib/tsearch2/wordparser/parser.c,v 1.11.2.3 2009/03/02 15:13:17 teodor Exp $ */ /* $PostgreSQL: pgsql/contrib/tsearch2/wordparser/parser.c,v 1.11.2.4 2009/03/10 17:44:44 teodor Exp $ */
#include "postgres.h" #include "postgres.h"
@ -370,6 +370,8 @@ p_ishost(TParser * prs)
TParser *tmpprs = TParserInit(prs->str + prs->state->posbyte, prs->lenstr - prs->state->posbyte); TParser *tmpprs = TParserInit(prs->str + prs->state->posbyte, prs->lenstr - prs->state->posbyte);
int res = 0; int res = 0;
tmpprs->wanthost = true;
if (TParserGet(tmpprs) && tmpprs->type == HOST) if (TParserGet(tmpprs) && tmpprs->type == HOST)
{ {
prs->state->posbyte += tmpprs->lenbytelexeme; prs->state->posbyte += tmpprs->lenbytelexeme;
@ -801,6 +803,7 @@ static TParserStateActionItem actionTPS_InHost[] = {
}; };
static TParserStateActionItem actionTPS_InEmail[] = { static TParserStateActionItem actionTPS_InEmail[] = {
{p_isstophost, 0, A_POP, TPS_Null, 0, NULL},
{p_ishost, 0, A_BINGO | A_CLRALL, TPS_Base, EMAIL, NULL}, {p_ishost, 0, A_BINGO | A_CLRALL, TPS_Base, EMAIL, NULL},
{NULL, 0, A_POP, TPS_Null, 0, NULL} {NULL, 0, A_POP, TPS_Null, 0, NULL}
}; };