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

Check for interrupts and stack overflow in TParserGet().

Browse Source 
TParserGet() recurses for some token types, meaning it's possible
to drive it to stack overflow.  Since this is a minority behavior,
I chose to add the check_stack_depth() call to the two places that
recurse rather than doing it during every single call.

While at it, add CHECK_FOR_INTERRUPTS(), because this can run
unpleasantly long for long inputs.

Per bug  from Zuming Jiang.  This is old, so back-patch
to all supported branches.

Discussion: https://postgr.es/m/17995-9f20ff3e6389db4c@postgresql.org
This commit is contained in:
Tom Lane 2023-06-24 17:18:08 -04:00
parent f08faee4b9
commit a77d901714
1 changed files with 15 additions and 0 deletions

15
src/backend/tsearch/wparser_def.c

@ -18,6 +18,7 @@
#include "catalog/pg_collation.h"
#include "commands/defrem.h"
#include "miscadmin.h"
#include "tsearch/ts_locale.h"
#include "tsearch/ts_public.h"
#include "tsearch/ts_type.h"
@ -631,6 +632,12 @@ p_ishost(TParser *prs)
tmpprs->wanthost = true;
/*
* Check stack depth before recursing. (Since TParserGet() doesn't
* normally recurse, we put the cost of checking here not there.)
*/
check_stack_depth();
if (TParserGet(tmpprs) && tmpprs->type == HOST)
{
prs->state->posbyte += tmpprs->lenbytetoken;
@ -654,6 +661,12 @@ p_isURLPath(TParser *prs)
tmpprs->state = newTParserPosition(tmpprs->state);
tmpprs->state->state = TPS_InURLPathFirst;
/*
* Check stack depth before recursing. (Since TParserGet() doesn't
* normally recurse, we put the cost of checking here not there.)
*/
check_stack_depth();
if (TParserGet(tmpprs) && tmpprs->type == URLPATH)
{
prs->state->posbyte += tmpprs->lenbytetoken;
@ -1697,6 +1710,8 @@ TParserGet(TParser *prs)
{
const TParserStateActionItem *item = NULL;
CHECK_FOR_INTERRUPTS();
Assert(prs->state);
if (prs->state->posbyte >= prs->lenstr)