summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2018-12-10 11:12:43 -0500
committerTom Lane <tgl@sss.pgh.pa.us>2018-12-10 11:12:43 -0500
commite60122b54daf6f0e93162161b41ecb9ab4655fa5 (patch)
tree5db10e020194c4ec6108f2d44d0c1dbd146be086 /src
parent9eaba23c414d9da1e767e1af0a80cb687dc358e2 (diff)
Add stack depth checks to key recursive functions in backend/nodes/*.c.
Although copyfuncs.c has a check_stack_depth call in its recursion, equalfuncs.c, outfuncs.c, and readfuncs.c lacked one. This seems unwise. Likewise fix planstate_tree_walker(), in branches where that exists. Discussion: https://postgr.es/m/30253.1544286631@sss.pgh.pa.us
Diffstat (limited to 'src')
-rw-r--r--src/backend/nodes/equalfuncs.c4
-rw-r--r--src/backend/nodes/nodeFuncs.c3
-rw-r--r--src/backend/nodes/outfuncs.c4
-rw-r--r--src/backend/nodes/readfuncs.c4
4 files changed, 15 insertions, 0 deletions
diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
index c5bb817ba19..c566eb9b257 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/extensible.h"
#include "nodes/relation.h"
#include "utils/datum.h"
@@ -2978,6 +2979,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/nodeFuncs.c b/src/backend/nodes/nodeFuncs.c
index e3eb0c57887..ba119a2e596 100644
--- a/src/backend/nodes/nodeFuncs.c
+++ b/src/backend/nodes/nodeFuncs.c
@@ -3701,6 +3701,9 @@ planstate_tree_walker(PlanState *planstate,
Plan *plan = planstate->plan;
ListCell *lc;
+ /* Guard against stack overflow due to overly complex plan trees */
+ check_stack_depth();
+
/* initPlan-s */
if (planstate_walk_subplans(planstate->initPlan, walker, context))
return true;
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index 95d6abb93e6..ec4d4b220cd 100644
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -30,6 +30,7 @@
#include <ctype.h>
#include "lib/stringinfo.h"
+#include "miscadmin.h"
#include "nodes/extensible.h"
#include "nodes/plannodes.h"
#include "nodes/relation.h"
@@ -3615,6 +3616,9 @@ _outPartitionRangeDatum(StringInfo str, const PartitionRangeDatum *node)
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 cd426638c51..38cd03ddf01 100644
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -29,6 +29,7 @@
#include <math.h>
#include "fmgr.h"
+#include "miscadmin.h"
#include "nodes/extensible.h"
#include "nodes/parsenodes.h"
#include "nodes/plannodes.h"
@@ -2452,6 +2453,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) \