Fix crash in multi_copy test

cmake_branch_point
Brian Cloutier 2018-04-11 11:25:07 -07:00
parent 21bd5654c0
commit c088f85b73
1 changed files with 7 additions and 3 deletions

View File

@ -992,13 +992,17 @@ BuildWaitEventSet(MultiConnection **allConnections, int totalConnectionCount,
WaitEventSet *waitEventSet = NULL; WaitEventSet *waitEventSet = NULL;
int connectionIndex = 0; int connectionIndex = 0;
/* we subtract 2 to make room for the WL_POSTMASTER_DEATH and WL_LATCH_SET events */ /*
if (pendingConnectionCount > FD_SETSIZE - 2) * subtract 3 to make room for WL_POSTMASTER_DEATH, WL_LATCH_SET, and
* pgwin32_signal_event.
*/
if (pendingConnectionCount > FD_SETSIZE - 3)
{ {
pendingConnectionCount = FD_SETSIZE - 2; pendingConnectionCount = FD_SETSIZE - 3;
} }
/* allocate pending connections + 2 for the signal latch and postmaster death */ /* allocate pending connections + 2 for the signal latch and postmaster death */
/* (CreateWaitEventSet makes room for pgwin32_signal_event automatically) */
waitEventSet = CreateWaitEventSet(CurrentMemoryContext, pendingConnectionCount + 2); waitEventSet = CreateWaitEventSet(CurrentMemoryContext, pendingConnectionCount + 2);
for (connectionIndex = 0; connectionIndex < pendingConnectionCount; connectionIndex++) for (connectionIndex = 0; connectionIndex < pendingConnectionCount; connectionIndex++)