Prevent stack overflow in query-type functions.

nmisch · nmisch · commit 28dea9485ef2 · 2015-10-05T10:06:34.000-04:00
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
@@ -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
@@ -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
@@ -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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -572,6 +572,9 @@ typedef struct`
`572`	`572`	`static void`
`573`	`573`	`infix(INFIX *in, bool first)`
`574`	`574`	`{`
	`575`	`+ /* since this function recurses, it could be driven to stack overflow. */`
	`576`	`+ check_stack_depth();`
	`577`	`+`
`575`	`578`	`if (in->curpol->type == VAL)`
`576`	`579`	`{`
`577`	`580`	`RESIZEBUF(in, 11);`
Original file line number	Diff line number	Diff line change
`@@ -419,6 +419,9 @@ while( ( (inf)->cur - (inf)->buf ) + (addsize) + 1 >= (inf)->buflen ) \`
`419`	`419`	`static void`
`420`	`420`	`infix(INFIX *in, bool first)`
`421`	`421`	`{`
	`422`	`+ /* since this function recurses, it could be driven to stack overflow. */`
	`423`	`+ check_stack_depth();`
	`424`	`+`
`422`	`425`	`if (in->curpol->type == VAL)`
`423`	`426`	`{`
`424`	`427`	`char *op = in->op + in->curpol->distance;`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,9 @@ maketree(QueryItem *in)`
`33`	`33`	`{`
`34`	`34`	`NODE node = (NODE ) palloc(sizeof(NODE));`
`35`	`35`
	`36`	`+ /* since this function recurses, it could be driven to stack overflow. */`
	`37`	`+ check_stack_depth();`
	`38`	`+`
`36`	`39`	`node->valnode = in;`
`37`	`40`	`node->right = node->left = NULL;`
`38`	`41`	`if (in->type == QI_OPR)`