database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-21 12:05:57 +03:00
Code

Prevent stack overflow in query-type functions.

Browse Source 
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).
This commit is contained in:
Noah Misch 2015-10-05 10:06:30 -04:00
parent 30cb12881d
commit 5976097c0f
4 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/intarray/_int_bool.c
View File

@ -564,6 +564,9 @@ typedef struct
static void static void
infix(INFIX *in, bool first) infix(INFIX *in, bool first)
{ {
/* since this function recurses, it could be driven to stack overflow. */
check_stack_depth();
if (in->curpol->type == VAL) if (in->curpol->type == VAL)
{ {
RESIZEBUF(in, 11); RESIZEBUF(in, 11);

3
contrib/ltree/ltxtquery_io.c
View File

@ -416,6 +416,9 @@ while( ( (inf)->cur - (inf)->buf ) + (addsize) + 1 >= (inf)->buflen ) \
static void static void
infix(INFIX *in, bool first) infix(INFIX *in, bool first)
{ {
/* since this function recurses, it could be driven to stack overflow. */
check_stack_depth();
if (in->curpol->type == VAL) if (in->curpol->type == VAL)
{ {
char *op = in->op + in->curpol->distance; char *op = in->op + in->curpol->distance;

4
contrib/ltree/ltxtquery_op.c
View File

@ -8,6 +8,7 @@
#include <ctype.h> #include <ctype.h>
#include "ltree.h" #include "ltree.h"
#include "miscadmin.h"
PG_FUNCTION_INFO_V1(ltxtq_exec); PG_FUNCTION_INFO_V1(ltxtq_exec);
PG_FUNCTION_INFO_V1(ltxtq_rexec); PG_FUNCTION_INFO_V1(ltxtq_rexec);
@ -18,6 +19,9 @@ PG_FUNCTION_INFO_V1(ltxtq_rexec);
bool bool
ltree_execute(ITEM *curitem, void *checkval, bool calcnot, bool (*chkcond) (void *checkval, ITEM *val)) 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) if (curitem->type == VAL)
return (*chkcond) (checkval, curitem); return (*chkcond) (checkval, curitem);
else if (curitem->val == (int32) '!') else if (curitem->val == (int32) '!')

3
src/backend/utils/adt/tsquery_cleanup.c
View File

@ -33,6 +33,9 @@ maketree(QueryItem *in)
{ {
NODE *node = (NODE *) palloc(sizeof(NODE)); NODE *node = (NODE *) palloc(sizeof(NODE));
/* since this function recurses, it could be driven to stack overflow. */
check_stack_depth();
node->valnode = in; node->valnode = in;
node->right = node->left = NULL; node->right = node->left = NULL;
if (in->type == QI_OPR) if (in->type == QI_OPR)