From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 30 Sep 2020 12:55:35 +0000 (+0200)
Subject: - Fix double loopexit for unbound-dnstap-socket after sigterm.
X-Git-Tag: release-1.12.0rc1~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea7c5ac392968656acc082c60ea3085a4082c328;p=thirdparty%2Funbound.git

- Fix double loopexit for unbound-dnstap-socket after sigterm.
---

diff --git a/dnstap/unbound-dnstap-socket.c b/dnstap/unbound-dnstap-socket.c
index 5a540f337..3ebe2b4e4 100644
--- a/dnstap/unbound-dnstap-socket.c
+++ b/dnstap/unbound-dnstap-socket.c
@@ -1167,8 +1167,10 @@ int sig_quit = 0;
 static RETSIGTYPE main_sigh(int sig)
 {
 	verbose(VERB_ALGO, "exit on signal %d\n", sig);
-	if(sig_base)
+	if(sig_base) {
 		ub_event_base_loopexit(sig_base);
+		sig_base = NULL;
+	}
 	sig_quit = 1;
 }
 
diff --git a/doc/Changelog b/doc/Changelog
index aba2a9ae2..7672435d4 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -5,6 +5,7 @@
 	  alloc check debug output.
 	- Easier kill of unbound-dnstap-socket tool in test.
 	- Fix memory leak of edns tags at libunbound context delete.
+	- Fix double loopexit for unbound-dnstap-socket after sigterm.
 
 29 September 2020: Ralph
 	- DNS Flag Day 2020: change edns-buffer-size default to 1232.