database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Don't dump core when destroying an unused ParallelContext.

Browse Source 
If a transaction or subtransaction creates a ParallelContext but ends
without calling InitializeParallelDSM, the previous code would
seg fault.  Fix that.
This commit is contained in:
Robert Haas
2015-09-30 18:36:31 -04:00
parent 75096c458a
commit 91d97f03ca
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/backend/access/transam/parallel.c
View File

@ -513,14 +513,17 @@ DestroyParallelContext(ParallelContext *pcxt)
dlist_delete(&pcxt->node); dlist_delete(&pcxt->node);
/* Kill each worker in turn, and forget their error queues. */ /* Kill each worker in turn, and forget their error queues. */
for (i = 0; i < pcxt->nworkers; ++i) if (pcxt->worker != NULL)
{ {
if (pcxt->worker[i].bgwhandle != NULL) for (i = 0; i < pcxt->nworkers; ++i)
TerminateBackgroundWorker(pcxt->worker[i].bgwhandle);
if (pcxt->worker[i].error_mqh != NULL)
{ {
pfree(pcxt->worker[i].error_mqh); if (pcxt->worker[i].bgwhandle != NULL)
pcxt->worker[i].error_mqh = NULL; TerminateBackgroundWorker(pcxt->worker[i].bgwhandle);
if (pcxt->worker[i].error_mqh != NULL)
{
pfree(pcxt->worker[i].error_mqh);
pcxt->worker[i].error_mqh = NULL;
}
} }
} }
@ -550,7 +553,7 @@ DestroyParallelContext(ParallelContext *pcxt)
{ {
BgwHandleStatus status; BgwHandleStatus status;
if (pcxt->worker[i].bgwhandle == NULL) if (pcxt->worker == NULL || pcxt->worker[i].bgwhandle == NULL)
continue; continue;
/* /*