diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2020-11-03 16:16:36 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2020-11-03 16:16:36 -0500 |
| commit | 9d878d7fee789d79afb846e401e56a65dd23a0f4 (patch) | |
| tree | 0586ba57ab837e79cbfe011d65b19a9ddd1c5666 | |
| parent | df4405b7848599311c5799f48caba1605490f2b2 (diff) | |
| download | postgresql-9d878d7fee789d79afb846e401e56a65dd23a0f4.tar.gz postgresql-9d878d7fee789d79afb846e401e56a65dd23a0f4.zip | |
Guard against core dump from uninitialized subplan.
If the planner erroneously puts a non-parallel-safe SubPlan into
a parallelized portion of the query tree, nodeSubplan.c will fail
in the worker processes because it finds a null in es_subplanstates,
which it's unable to cope with. It seems worth a test-and-elog to
make that an error case rather than a core dump case.
This probably should have been included in commit 16ebab688, which
was responsible for allowing nulls to appear in es_subplanstates
to begin with. So, back-patch to v10 where that came in.
Discussion: https://postgr.es/m/924226.1604422326@sss.pgh.pa.us
| -rw-r--r-- | src/backend/executor/nodeSubplan.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c index 28bbaaf83cf..aa34f86e0ec 100644 --- a/src/backend/executor/nodeSubplan.c +++ b/src/backend/executor/nodeSubplan.c @@ -710,7 +710,15 @@ ExecInitSubPlan(SubPlan *subplan, PlanState *parent) sstate->planstate = (PlanState *) list_nth(estate->es_subplanstates, subplan->plan_id - 1); - /* ... and to its parent's state */ + /* + * This check can fail if the planner mistakenly puts a parallel-unsafe + * subplan into a parallelized subquery; see ExecSerializePlan. + */ + if (sstate->planstate == NULL) + elog(ERROR, "subplan \"%s\" was not initialized", + subplan->plan_name); + + /* Link to parent's state, too */ sstate->parent = parent; /* Initialize subexpressions */ |