rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-08-27 04:37:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add stack depth checks to key recursive functions in backend/nodes/*.c.

Browse Source 
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
This commit is contained in:
Tom Lane 2018-12-10 11:12:43 -05:00
parent 078303f79b
commit 0f9fd7419a
4 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/nodes/equalfuncs.c
View File

@ -29,6 +29,7 @@
#include "postgres.h" #include "postgres.h"
#include "miscadmin.h"
#include "nodes/extensible.h" #include "nodes/extensible.h"
#include "nodes/relation.h" #include "nodes/relation.h"
#include "utils/datum.h" #include "utils/datum.h"
@ -2732,6 +2733,9 @@ equal(const void *a, const void *b)
if (nodeTag(a) != nodeTag(b)) if (nodeTag(a) != nodeTag(b))
return false; return false;
/* Guard against stack overflow due to overly complex expressions */
check_stack_depth();
switch (nodeTag(a)) switch (nodeTag(a))
{ {
/* /*

3
src/backend/nodes/nodeFuncs.c
View File

@ -3623,6 +3623,9 @@ planstate_tree_walker(PlanState *planstate,
Plan *plan = planstate->plan; Plan *plan = planstate->plan;
ListCell *lc; ListCell *lc;
/* Guard against stack overflow due to overly complex plan trees */
check_stack_depth();
/* initPlan-s */ /* initPlan-s */
if (planstate_walk_subplans(planstate->initPlan, walker, context)) if (planstate_walk_subplans(planstate->initPlan, walker, context))
return true; return true;

4
src/backend/nodes/outfuncs.c
View File

@ -26,6 +26,7 @@
#include <ctype.h> #include <ctype.h>
#include "lib/stringinfo.h" #include "lib/stringinfo.h"
#include "miscadmin.h"
#include "nodes/extensible.h" #include "nodes/extensible.h"
#include "nodes/plannodes.h" #include "nodes/plannodes.h"
#include "nodes/relation.h" #include "nodes/relation.h"
@ -3276,6 +3277,9 @@ _outForeignKeyCacheInfo(StringInfo str, const ForeignKeyCacheInfo *node)
void void
outNode(StringInfo str, const void *obj) outNode(StringInfo str, const void *obj)
{ {
/* Guard against stack overflow due to overly complex expressions */
check_stack_depth();
if (obj == NULL) if (obj == NULL)
appendStringInfoString(str, "<>"); appendStringInfoString(str, "<>");
else if (IsA(obj, List) ||IsA(obj, IntList) || IsA(obj, OidList)) else if (IsA(obj, List) ||IsA(obj, IntList) || IsA(obj, OidList))

4
src/backend/nodes/readfuncs.c
View File

@ -29,6 +29,7 @@
#include <math.h> #include <math.h>
#include "fmgr.h" #include "fmgr.h"
#include "miscadmin.h"
#include "nodes/extensible.h" #include "nodes/extensible.h"
#include "nodes/parsenodes.h" #include "nodes/parsenodes.h"
#include "nodes/plannodes.h" #include "nodes/plannodes.h"
@ -2262,6 +2263,9 @@ parseNodeString(void)
READ_TEMP_LOCALS(); READ_TEMP_LOCALS();
/* Guard against stack overflow due to overly complex expressions */
check_stack_depth();
token = pg_strtok(&length); token = pg_strtok(&length);
#define MATCH(tokname, namelen) \ #define MATCH(tokname, namelen) \