rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix WaitEventSet resource leak in WaitLatchOrSocket(). 

This function would have the same issue we solved in commit 501cfd07d:
If an error is thrown after calling CreateWaitEventSet(), the file
descriptor (on epoll- or kqueue-based systems) or handles (on Windows)
that the WaitEventSet contains are leaked.

Like that commit, use PG_TRY-PG_FINALLY (PG_TRY-PG_CATCH in v12) to make
sure the WaitEventSet is freed properly.

Back-patch to all supported versions, but as we do not have this issue
in HEAD (cf. commit 50c67c201), no need to apply this patch to it.

Discussion: https://postgr.es/m/CAPmGK16MqdDoD8oatp8SQWaEa4vS3nfQqDN_Sj9YRuu5J3Lj9g%40mail.gmail.com
This commit is contained in:
Etsuro Fujita 2024-04-11 19:05:07 +09:00
parent 5e9d8bed00
commit 0341d4b10e
1 changed files with 44 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/backend/storage/ipc/latch.c
View File

@ -374,6 +374,8 @@ WaitLatchOrSocket(Latch *latch, int wakeEvents, pgsocket sock,
WaitEvent event;
WaitEventSet *set = CreateWaitEventSet(CurrentMemoryContext, 3);
PG_TRY();
{
if (wakeEvents & WL_TIMEOUT)
Assert(timeout >= 0);
else
@ -414,6 +416,13 @@ WaitLatchOrSocket(Latch *latch, int wakeEvents, pgsocket sock,
WL_POSTMASTER_DEATH |
WL_SOCKET_MASK);
}
}
PG_CATCH();
{
FreeWaitEventSet(set);
PG_RE_THROW();
}
PG_END_TRY();
FreeWaitEventSet(set);