mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-09-03 23:37:22 +02:00
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).
This commit is contained in:
parent
acf0da1e64
commit
7bed97d486
@ -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);
|
||||
|
@ -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;
|
||||
|
@ -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) '!')
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user