diff options
| -rw-r--r-- | src/backend/nodes/equalfuncs.c | 4 | ||||
| -rw-r--r-- | src/backend/nodes/outfuncs.c | 4 | ||||
| -rw-r--r-- | src/backend/nodes/readfuncs.c | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c index d48f7f66014..08ae7d2bf32 100644 --- a/src/backend/nodes/equalfuncs.c +++ b/src/backend/nodes/equalfuncs.c @@ -29,6 +29,7 @@ #include "postgres.h" +#include "miscadmin.h" #include "nodes/relation.h" #include "utils/datum.h" @@ -2514,6 +2515,9 @@ equal(const void *a, const void *b) if (nodeTag(a) != nodeTag(b)) return false; + /* Guard against stack overflow due to overly complex expressions */ + check_stack_depth(); + switch (nodeTag(a)) { /* diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c index 9c16a1f4ea9..fd63db5c0d1 100644 --- a/src/backend/nodes/outfuncs.c +++ b/src/backend/nodes/outfuncs.c @@ -24,6 +24,7 @@ #include <ctype.h> #include "lib/stringinfo.h" +#include "miscadmin.h" #include "nodes/plannodes.h" #include "nodes/relation.h" #include "utils/datum.h" @@ -2757,6 +2758,9 @@ _outConstraint(StringInfo str, const Constraint *node) static void _outNode(StringInfo str, const void *obj) { + /* Guard against stack overflow due to overly complex expressions */ + check_stack_depth(); + if (obj == NULL) appendStringInfoString(str, "<>"); else if (IsA(obj, List) ||IsA(obj, IntList) || IsA(obj, OidList)) diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c index 1ec4f3c6956..6498541d4ac 100644 --- a/src/backend/nodes/readfuncs.c +++ b/src/backend/nodes/readfuncs.c @@ -28,6 +28,7 @@ #include <math.h> +#include "miscadmin.h" #include "nodes/parsenodes.h" #include "nodes/readfuncs.h" @@ -1292,6 +1293,9 @@ parseNodeString(void) READ_TEMP_LOCALS(); + /* Guard against stack overflow due to overly complex expressions */ + check_stack_depth(); + token = pg_strtok(&length); #define MATCH(tokname, namelen) \ |