mirror of
https://github.com/postgres/postgres.git
synced 2025-07-28 23:42:10 +03:00
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.
This commit is contained in:
@ -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;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user