Install check_stack_depth() protection in two recursive tsquery

processing routines.  Per Heikki.

diff --git a/src/backend/utils/adt/tsquery.c b/src/backend/utils/adt/tsquery.c
index 1b59158954c7a8bd0dc1764713ad6a9030dc50eb..51b09cbbcac639b1dc2619cbd92a301159707375 100644 (file)
--- a/src/backend/utils/adt/tsquery.c
+++ b/src/backend/utils/adt/tsquery.c
@@ -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)

diff --git a/src/backend/utils/adt/tsvector_op.c b/src/backend/utils/adt/tsvector_op.c
index 4600cfad41a8e134742178b8060edd0fc075a9f6..af89bf51bfcb087c9f4ee2a844ae6e56cc8f8dcd 100644 (file)
--- a/src/backend/utils/adt/tsvector_op.c
+++ b/src/backend/utils/adt/tsvector_op.c
@@ -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) '&')