Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 1b2a386

Browse files
committed
Add stack-overflow guards in set-operation planning.
create_plan_recurse lacked any stack depth check. This is not per our normal coding rules, but I'd supposed it was safe because earlier planner processing is more complex and presumably should eat more stack. But bug #15033 from Andrew Grossman shows this isn't true, at least not for queries having the form of a many-thousand-way INTERSECT stack. Further testing showed that recurse_set_operations is also capable of being crashed in this way, since it likewise will recurse to the bottom of a parsetree before calling any support functions that might themselves contain any stack checks. However, its stack consumption is only perhaps a third of create_plan_recurse's. It's possible that this particular problem with create_plan_recurse can only manifest in 9.6 and later, since before that we didn't build a Path tree for set operations. But having seen this example, I now have no faith in the proposition that create_plan_recurse doesn't need a stack check, so back-patch to all supported branches. Discussion: https://postgr.es/m/20180127050845.28812.58244@wrigleys.postgresql.org
1 parent 76e117d commit 1b2a386

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

src/backend/optimizer/plan/createplan.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,9 @@ create_plan_recurse(PlannerInfo *root, Path *best_path, int flags)
355355
{
356356
Plan *plan;
357357

358+
/* Guard against stack overflow due to overly complex plans */
359+
check_stack_depth();
360+
358361
switch (best_path->pathtype)
359362
{
360363
case T_SeqScan:

src/backend/optimizer/prep/prepunion.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,9 @@ recurse_set_operations(Node *setOp, PlannerInfo *root,
252252
List **pTargetList,
253253
double *pNumGroups)
254254
{
255+
/* Guard against stack overflow due to overly complex setop nests */
256+
check_stack_depth();
257+
255258
if (IsA(setOp, RangeTblRef))
256259
{
257260
RangeTblRef *rtr = (RangeTblRef *) setOp;

0 commit comments

Comments
 (0)