diff options
| author | Noah Misch <noah@leadboat.com> | 2015-10-05 10:06:30 -0400 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2015-10-05 10:06:30 -0400 |
| commit | 5976097c0fce03f8cc201aefc4445ad57e09bb75 (patch) | |
| tree | 011ef8299f97ed7812358207b555abe564fedbe5 | |
| parent | 30cb12881de55bc91a2cbde29d836bd3332612c3 (diff) | |
| download | postgresql-5976097c0fce03f8cc201aefc4445ad57e09bb75.tar.gz postgresql-5976097c0fce03f8cc201aefc4445ad57e09bb75.zip | |
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).
| -rw-r--r-- | contrib/intarray/_int_bool.c | 3 | ||||
| -rw-r--r-- | contrib/ltree/ltxtquery_io.c | 3 | ||||
| -rw-r--r-- | contrib/ltree/ltxtquery_op.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/adt/tsquery_cleanup.c | 3 |
4 files changed, 13 insertions, 0 deletions
diff --git a/contrib/intarray/_int_bool.c b/contrib/intarray/_int_bool.c index c3c39d194bc..5d9e676660f 100644 --- a/contrib/intarray/_int_bool.c +++ b/contrib/intarray/_int_bool.c @@ -564,6 +564,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 ddc63d7b66b..74010f3cef4 100644 --- a/contrib/ltree/ltxtquery_io.c +++ b/contrib/ltree/ltxtquery_io.c @@ -416,6 +416,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 64f9d219f76..1428c8b4780 100644 --- 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 2545f4eea7c..b841006dd0f 100644 --- 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) |