summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2021-01-29 06:48:17 +0000
committerRoy Marples <roy@marples.name>2021-01-29 06:53:12 +0000
commit14d3b511ee71c1fb39e383949384a7a43fac0263 (patch)
treed99206174661caa9819fc9aeaa610b7f6cf434af
parent410ea0e8c61acab37a6a4cab1e714cf279f35c9b (diff)
downloaddhcpcd-14d3b511ee71c1fb39e383949384a7a43fac0263.tar.xz
eloop: fix a memory leak when clearing events
-rw-r--r--src/eloop.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/eloop.c b/src/eloop.c
index 33177667..834af968 100644
--- a/src/eloop.c
+++ b/src/eloop.c
@@ -953,13 +953,14 @@ eloop_clear(struct eloop *eloop, ...)
if (e->fd == except_fd && e->fd != -1)
continue;
TAILQ_REMOVE(&eloop->events, e, next);
- if (e->fd != -1)
+ if (e->fd != -1) {
close(e->fd);
+ eloop->nevents--;
+ }
free(e);
- eloop->nevents--;
}
va_end(va1);
- if (eloop->nevents == 0) {
+ if (TAILQ_FIRST(&eloop->events) == NULL) {
free(eloop->fds);
eloop->fds = NULL;
eloop->nfds = 0;