From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 11 Dec 2015 10:26:15 +0000 (+0000)
Subject: - remove NULL-checks before free, patch from Michael McConville.
X-Git-Tag: release-1.5.8~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72a5931a68037de3b31ba7a4024d99ba57dae267;p=thirdparty%2Funbound.git

- remove NULL-checks before free, patch from Michael McConville.


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

diff --git a/doc/Changelog b/doc/Changelog
index 296f75b60..8930a797f 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+11 December 2015: Wouter
+	- remove NULL-checks before free, patch from Michael McConville.
+
 10 December 2015: Wouter
 	- 1.5.7 release
 	- trunk has 1.5.8 in development.
diff --git a/testcode/replay.c b/testcode/replay.c
index 8a88814e7..22670eb93 100644
--- a/testcode/replay.c
+++ b/testcode/replay.c
@@ -499,8 +499,7 @@ replay_scenario_delete(struct replay_scenario* scen)
 	struct replay_range* rng, *rngn;
 	if(!scen)
 		return;
-	if(scen->title)
-		free(scen->title);
+	free(scen->title);
 	mom = scen->mom_first;
 	while(mom) {
 		momn = mom->mom_next;
diff --git a/util/data/packed_rrset.c b/util/data/packed_rrset.c
index 0a5c9d327..66399085a 100644
--- a/util/data/packed_rrset.c
+++ b/util/data/packed_rrset.c
@@ -57,11 +57,9 @@ ub_packed_rrset_parsedelete(struct ub_packed_rrset_key* pkey,
 {
 	if(!pkey)
 		return;
-	if(pkey->entry.data)
-		free(pkey->entry.data);
+	free(pkey->entry.data);
 	pkey->entry.data = NULL;
-	if(pkey->rk.dname)
-		free(pkey->rk.dname);
+	free(pkey->rk.dname);
 	pkey->rk.dname = NULL;
 	pkey->id = 0;
 	alloc_special_release(alloc, pkey);
diff --git a/util/mini_event.c b/util/mini_event.c
index 40dca375a..98d15f677 100644
--- a/util/mini_event.c
+++ b/util/mini_event.c
@@ -261,12 +261,9 @@ void event_base_free(struct event_base* base)
 {
 	if(!base)
 		return;
-	if(base->times)
-		free(base->times);
-	if(base->fds)
-		free(base->fds);
-	if(base->signals)
-		free(base->signals);
+	free(base->times);
+	free(base->fds);
+	free(base->signals);
 	free(base);
 }
 
diff --git a/util/random.c b/util/random.c
index 684464e7d..8332960b4 100644
--- a/util/random.c
+++ b/util/random.c
@@ -228,7 +228,6 @@ ub_random_max(struct ub_randstate* state, long int x)
 void 
 ub_randfree(struct ub_randstate* s)
 {
-	if(s)
-		free(s);
+	free(s);
 	/* user app must do RAND_cleanup(); */
 }
diff --git a/util/tube.c b/util/tube.c
index 2106a078c..053547438 100644
--- a/util/tube.c
+++ b/util/tube.c
@@ -118,10 +118,8 @@ void tube_remove_bg_listen(struct tube* tube)
 		comm_point_delete(tube->listen_com);
 		tube->listen_com = NULL;
 	}
-	if(tube->cmd_msg) {
-		free(tube->cmd_msg);
-		tube->cmd_msg = NULL;
-	}
+	free(tube->cmd_msg);
+	tube->cmd_msg = NULL;
 }
 
 void tube_remove_bg_write(struct tube* tube)
diff --git a/util/winsock_event.c b/util/winsock_event.c
index 38661a5e1..40b79821a 100644
--- a/util/winsock_event.c
+++ b/util/winsock_event.c
@@ -459,12 +459,9 @@ void event_base_free(struct event_base *base)
 	verbose(VERB_CLIENT, "winsock_event event_base_free");
         if(!base)
                 return;
-	if(base->items)
-		free(base->items);
-        if(base->times)
-                free(base->times);
-        if(base->signals)
-                free(base->signals);
+	free(base->items);
+        free(base->times);
+        free(base->signals);
         free(base);
 }