From 8367b24bc5741fbb2860d6aa73223807326ec741 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 8 Nov 2022 12:02:48 +0100
Subject: [PATCH] - Fix to ignore tcp events for closed comm points.

---
 doc/Changelog   | 3 +++
 util/netevent.c | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index 32e7ae8ae..8b2cfb762 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+8 November 2022: Wouter
+	- Fix to ignore tcp events for closed comm points.
+
 21 October 2022: George
 	- Merge #767 from jonathangray: consistently use IPv4/IPv6 in
 	  unbound.conf.5.
diff --git a/util/netevent.c b/util/netevent.c
index c67a49ff8..09def2e44 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -2623,6 +2623,9 @@ comm_point_tcp_handle_callback(int fd, short event, void* arg)
 	log_assert(c->type == comm_tcp);
 	ub_comm_base_now(c->ev->base);
 
+	if(c->fd == -1 || c->fd != fd)
+		return; /* duplicate event, but commpoint closed. */
+
 #ifdef USE_DNSCRYPT
 	/* Initialize if this is a dnscrypt socket */
 	if(c->tcp_parent) {