diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2007-08-31 02:26:29 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2007-08-31 02:26:29 +0000 |
| commit | 79048ca1a4bb5dd14a088367bbe8c7d877844ea3 (patch) | |
| tree | 36f247391d5d11a43fe08096a04c33c472ab4b68 /src/backend/utils/adt/tsquery.c | |
| parent | ac20d3dfbe64ba1b18fa2b9d9880f95c93d1aa53 (diff) | |
| download | postgresql-79048ca1a4bb5dd14a088367bbe8c7d877844ea3.tar.gz postgresql-79048ca1a4bb5dd14a088367bbe8c7d877844ea3.zip | |
Install check_stack_depth() protection in two recursive tsquery
processing routines. Per Heikki.
Diffstat (limited to 'src/backend/utils/adt/tsquery.c')
| -rw-r--r-- | src/backend/utils/adt/tsquery.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/backend/utils/adt/tsquery.c b/src/backend/utils/adt/tsquery.c index 1f8abb3298e..83759728ff9 100644 --- a/src/backend/utils/adt/tsquery.c +++ b/src/backend/utils/adt/tsquery.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery.c,v 1.1 2007/08/21 01:11:19 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery.c,v 1.2 2007/08/31 02:26:29 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -15,12 +15,14 @@ #include "postgres.h" #include "libpq/pqformat.h" +#include "miscadmin.h" #include "tsearch/ts_locale.h" #include "tsearch/ts_type.h" #include "tsearch/ts_utils.h" #include "utils/memutils.h" #include "utils/pg_crc.h" + /* parser's states */ #define WAITOPERAND 1 #define WAITOPERATOR 2 @@ -234,11 +236,13 @@ pushval_asis(TSQueryParserState * state, int type, char *strval, int lenval, int } #define STACKDEPTH 32 + /* * make polish notation of query */ static int4 -makepol(TSQueryParserState * state, void (*pushval) (TSQueryParserState *, int, char *, int, int2)) +makepol(TSQueryParserState * state, + void (*pushval) (TSQueryParserState *, int, char *, int, int2)) { int4 val = 0, type; @@ -248,6 +252,9 @@ makepol(TSQueryParserState * state, void (*pushval) (TSQueryParserState *, int, int4 lenstack = 0; int2 weight = 0; + /* since this function recurses, it could be driven to stack overflow */ + check_stack_depth(); + while ((type = gettoken_query(state, &val, &lenval, &strval, &weight)) != END) { switch (type) |