Prevent stack overflow in query-type functions.

The tsquery, ltxtquery and query_int data types have a common ancestor.
Having acquired check_stack_depth() calls independently, each was
missing at least one call.  Back-patch to 9.0 (all supported versions).

diff --git a/contrib/intarray/_int_bool.c b/contrib/intarray/_int_bool.c
index 1eea3713ac1d88032df9f3dc22f68ba6e26e3db8..f70d77b2fc0dceeaa9b464b4cbb7f026ff437f73 100644 (file)
--- a/contrib/intarray/_int_bool.c
+++ b/contrib/intarray/_int_bool.c
@@ -572,6 +572,9 @@ typedef struct
 static void
 infix(INFIX *in, bool first)
 {
+   /* since this function recurses, it could be driven to stack overflow. */
+   check_stack_depth();
+
    if (in->curpol->type == VAL)
    {
        RESIZEBUF(in, 11);

diff --git a/contrib/ltree/ltxtquery_io.c b/contrib/ltree/ltxtquery_io.c
index 982186581a3aa94fb5dea5c273ca61b9ac65d94f..0518218395d9fb4070e281bdd38a1a68a982a3c0 100644 (file)
--- a/contrib/ltree/ltxtquery_io.c
+++ b/contrib/ltree/ltxtquery_io.c
@@ -419,6 +419,9 @@ while( ( (inf)->cur - (inf)->buf ) + (addsize) + 1 >= (inf)->buflen ) \
 static void
 infix(INFIX *in, bool first)
 {
+   /* since this function recurses, it could be driven to stack overflow. */
+   check_stack_depth();
+
    if (in->curpol->type == VAL)
    {
        char       *op = in->op + in->curpol->distance;

diff --git a/contrib/ltree/ltxtquery_op.c b/contrib/ltree/ltxtquery_op.c
index 64f9d219f76785dd08336c450fea6109e7e0733b..1428c8b47806f2c84b0fa5530c8d0b2f80ca2db8 100644 (file)
--- a/contrib/ltree/ltxtquery_op.c
+++ b/contrib/ltree/ltxtquery_op.c
@@ -8,6 +8,7 @@
 #include <ctype.h>
 
 #include "ltree.h"
+#include "miscadmin.h"
 
 PG_FUNCTION_INFO_V1(ltxtq_exec);
 PG_FUNCTION_INFO_V1(ltxtq_rexec);
@@ -18,6 +19,9 @@ PG_FUNCTION_INFO_V1(ltxtq_rexec);
 bool
 ltree_execute(ITEM *curitem, void *checkval, bool calcnot, bool (*chkcond) (void *checkval, ITEM *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 == (int32) '!')

diff --git a/src/backend/utils/adt/tsquery_cleanup.c b/src/backend/utils/adt/tsquery_cleanup.c
index feda2f3d207c12776d4c47ea889402817c9af6ab..81902e5377d4e08dc4b6f6f74c3ce552c797cb09 100644 (file)
--- a/src/backend/utils/adt/tsquery_cleanup.c
+++ b/src/backend/utils/adt/tsquery_cleanup.c
@@ -33,6 +33,9 @@ maketree(QueryItem *in)
 {
    NODE       *node = (NODE *) palloc(sizeof(NODE));
 
+   /* since this function recurses, it could be driven to stack overflow. */
+   check_stack_depth();
+
    node->valnode = in;
    node->right = node->left = NULL;
    if (in->type == QI_OPR)