From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Thu, 15 Sep 2016 08:39:59 +0000 (+0000)
Subject: fix potential memory leak in daemon/remote.c and nullpointer dereference in
X-Git-Tag: release-1.5.10~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e2e34ad273276d9ac50b338f3d4bd352885cb29e;p=thirdparty%2Funbound.git

fix potential memory leak in daemon/remote.c and nullpointer dereference in
validator/autotrust.


git-svn-id: file:///svn/unbound/trunk@3856 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/daemon/remote.c b/daemon/remote.c
index 4c8375f90..65c4fe4df 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -245,6 +245,7 @@ daemon_remote_create(struct config_file* cfg)
 		/* No certificates are requested */
 		if(!SSL_CTX_set_cipher_list(rc->ctx, "aNULL")) {
 			log_crypto_err("Failed to set aNULL cipher list");
+			daemon_remote_delete(rc);
 			return NULL;
 		}
 
@@ -253,6 +254,7 @@ daemon_remote_create(struct config_file* cfg)
 		 */
 		if(!SSL_CTX_set_tmp_dh(rc->ctx,get_dh2048())) {
 			log_crypto_err("Wanted to set DH param, but failed");
+			daemon_remote_delete(rc);
 			return NULL;
 		}
 		return rc;
diff --git a/doc/Changelog b/doc/Changelog
index f6abd9e77..cd8f84ae9 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+15 September 2016: Ralph
+	- fix potential memory leak in daemon/remote.c and nullpointer
+	  dereference in validator/autotrust.
+
 13 September 2016: Wouter
 	- Silenced flex-generated sign-unsigned warning print with gcc
 	  diagnostic pragma.
diff --git a/validator/autotrust.c b/validator/autotrust.c
index f76aec2c1..da8829ceb 100644
--- a/validator/autotrust.c
+++ b/validator/autotrust.c
@@ -430,6 +430,8 @@ find_add_tp(struct val_anchors* anchors, uint8_t* rr, size_t rr_len,
 	}
 	tp = autr_tp_create(anchors, rr, dname_len, sldns_wirerr_get_class(rr,
 		rr_len, dname_len));
+	if(!tp)	
+		return NULL;
 	lock_basic_lock(&tp->lock);
 	return tp;
 }