From 2951f21dabae4b6d27c1ff9487888c289c66f556 Mon Sep 17 00:00:00 2001
From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Thu, 26 Apr 2018 06:59:49 +0000
Subject: [PATCH] - Fix for crash in daemon_cleanup with dnstap during reload, 
  from Saksham Manchanda. - Also that for dnscrypt.

git-svn-id: file:///svn/unbound/trunk@4663 be551aaa-1e26-0410-a405-d3ace91eadb9
---
 daemon/daemon.c | 2 ++
 doc/Changelog   | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/daemon/daemon.c b/daemon/daemon.c
index f68bd981b..85ae1e0a1 100644
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -706,9 +706,11 @@ daemon_cleanup(struct daemon* daemon)
 	daemon->num = 0;
 #ifdef USE_DNSTAP
 	dt_delete(daemon->dtenv);
+	daemon->dtenv = NULL;
 #endif
 #ifdef USE_DNSCRYPT
 	dnsc_delete(daemon->dnscenv);
+	daemon->dnscenv = NULL;
 #endif
 	daemon->cfg = NULL;
 }
diff --git a/doc/Changelog b/doc/Changelog
index c48609b97..6e404cdf9 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,8 @@
+26 April 2018: Wouter
+	- Fix for crash in daemon_cleanup with dnstap during reload,
+	  from Saksham Manchanda.
+	- Also that for dnscrypt.
+
 25 April 2018: Ralph
 	- Fix memory leak when caching wildcard records for aggressive NSEC use