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

feodor · feodor · commit 42831729f7c9 · 2009-03-10T17:32:14.000Z
Patch by Heikki Linnakangas &lt;heikki.linnakangas@enterprisedb.com&gt;
diff --git a/src/backend/tsearch/wparser_def.c b/src/backend/tsearch/wparser_def.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/tsearch/wparser_def.c,v 1.21 2009/03/02 15:10:09 teodor Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tsearch/wparser_def.c,v 1.22 2009/03/10 17:32:14 teodor Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -620,6 +620,8 @@ p_ishost(TParser *prs)
 	TParser    *tmpprs = TParserInit(prs->str + prs->state->posbyte, prs->lenstr - prs->state->posbyte);
 	int			res = 0;
 
+	tmpprs->wanthost = true;
+
 	if (TParserGet(tmpprs) && tmpprs->type == HOST)
 	{
 		prs->state->posbyte += tmpprs->lenbytetoken;
@@ -1070,6 +1072,7 @@ static const TParserStateActionItem actionTPS_InHost[] = {
 };
 
 static const TParserStateActionItem actionTPS_InEmail[] = {
+	{p_isstophost, 0, A_POP, TPS_Null, 0, NULL},
 	{p_ishost, 0, A_BINGO | A_CLRALL, TPS_Base, EMAIL, NULL},
 	{NULL, 0, A_POP, TPS_Null, 0, NULL}
 };

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $PostgreSQL: pgsql/src/backend/tsearch/wparser_def.c,v 1.21 2009/03/02 15:10:09 teodor Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/tsearch/wparser_def.c,v 1.22 2009/03/10 17:32:14 teodor Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -620,6 +620,8 @@ p_ishost(TParser *prs)`
`620`	`620`	`TParser *tmpprs = TParserInit(prs->str + prs->state->posbyte, prs->lenstr - prs->state->posbyte);`
`621`	`621`	`int res = 0;`
`622`	`622`
	`623`	`+ tmpprs->wanthost = true;`
	`624`	`+`
`623`	`625`	`if (TParserGet(tmpprs) && tmpprs->type == HOST)`
`624`	`626`	`{`
`625`	`627`	`prs->state->posbyte += tmpprs->lenbytetoken;`
`@@ -1070,6 +1072,7 @@ static const TParserStateActionItem actionTPS_InHost[] = {`
`1070`	`1072`	`};`
`1071`	`1073`
`1072`	`1074`	`static const TParserStateActionItem actionTPS_InEmail[] = {`
	`1075`	`+ {p_isstophost, 0, A_POP, TPS_Null, 0, NULL},`
`1073`	`1076`	`{p_ishost, 0, A_BINGO \| A_CLRALL, TPS_Base, EMAIL, NULL},`
`1074`	`1077`	`{NULL, 0, A_POP, TPS_Null, 0, NULL}`
`1075`	`1078`	`};`