From 6c878a7553680579f287e4659592c0b874fb2377 Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Fri, 20 Nov 2015 13:03:39 -0500 Subject: [PATCH] Avoid server crash when worker registration fails at execution time. The previous coding attempts to destroy the DSM in this case, but child nodes might have stored data there and still be holding onto pointers in this case. So don't do that. Also, free the reader array instead of leaking it. Extracted from two different patch versions both by Amit Kapila. --- src/backend/executor/nodeGather.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/backend/executor/nodeGather.c b/src/backend/executor/nodeGather.c index b6e82d1664..f8c1ba637d 100644 --- a/src/backend/executor/nodeGather.c +++ b/src/backend/executor/nodeGather.c @@ -190,7 +190,7 @@ ExecGather(GatherState *node) /* No workers? Then never mind. */ if (!got_any_worker) - ExecShutdownGather(node); + ExecShutdownGatherWorkers(node); } /* Run plan locally if no workers or not single-copy. */ @@ -402,6 +402,8 @@ ExecShutdownGatherWorkers(GatherState *node) for (i = 0; i < node->nreaders; ++i) DestroyTupleQueueReader(node->reader[i]); + + pfree(node->reader); node->reader = NULL; } -- 2.40.0