From: Roy Marples <roy@marples.name>
Date: Fri, 29 Jan 2021 06:48:17 +0000 (+0000)
Subject: eloop: fix a memory leak when clearing events
X-Git-Tag: v10.0.0~130
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14d3b511ee71c1fb39e383949384a7a43fac0263;p=thirdparty%2Fdhcpcd.git

eloop: fix a memory leak when clearing events
---

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;