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/tsvector_op.c | |
| parent | ac20d3dfbe64ba1b18fa2b9d9880f95c93d1aa53 (diff) | |
Install check_stack_depth() protection in two recursive tsquery
processing routines. Per Heikki.
Diffstat (limited to 'src/backend/utils/adt/tsvector_op.c')
| -rw-r--r-- | src/backend/utils/adt/tsvector_op.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/backend/utils/adt/tsvector_op.c b/src/backend/utils/adt/tsvector_op.c index 341247bec75..8567172c64f 100644 --- a/src/backend/utils/adt/tsvector_op.c +++ b/src/backend/utils/adt/tsvector_op.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/tsvector_op.c,v 1.1 2007/08/21 01:11:19 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/tsvector_op.c,v 1.2 2007/08/31 02:26:29 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -19,6 +19,7 @@ #include "executor/spi.h" #include "funcapi.h" #include "mb/pg_wchar.h" +#include "miscadmin.h" #include "tsearch/ts_type.h" #include "tsearch/ts_utils.h" #include "utils/builtins.h" @@ -525,14 +526,18 @@ checkcondition_str(void *checkval, QueryItem * val) * check for boolean condition */ bool -TS_execute(QueryItem * curitem, void *checkval, bool calcnot, bool (*chkcond) (void *checkval, QueryItem * val)) +TS_execute(QueryItem * curitem, void *checkval, bool calcnot, + bool (*chkcond) (void *checkval, QueryItem * val)) { + /* since this function recurses, it could be driven to stack overflow */ + check_stack_depth(); + if (curitem->type == VAL) return chkcond(checkval, curitem); else if (curitem->val == (int4) '!') { return (calcnot) ? - ((TS_execute(curitem + 1, checkval, calcnot, chkcond)) ? false : true) + !TS_execute(curitem + 1, checkval, calcnot, chkcond) : true; } else if (curitem->val == (int4) '&') |