- 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

diff --git a/daemon/daemon.c b/daemon/daemon.c
index f68bd981b01b76fa4384c7ca7e1635c4ef2be12c..85ae1e0a15ac5f7fed7b53954b9cd6f624261eba 100644 (file)
--- 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 c48609b9780f4f2019ae650e43e7e4293f7f8630..6e404cdf972fea30c38bfdf9303dd2601f8f5873 100644 (file)
--- 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