- 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 296f75b60950d71dea4e112da71a88cf8e4316cc..8930a797f5ccb2aa9aa0109c1136206eaaed817a 100644 (file)
--- 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 8a88814e765ad8c201104001d7bef5e6d3be5f56..22670eb932769fffaa1782750c82a4fc8609e08c 100644 (file)
--- 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 0a5c9d3271b1824dafb7af9f3f844dd5b394b299..66399085a65e634d3081615146e57479fce8f73d 100644 (file)
--- 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 40dca375a0153b7ce1988ed237a69b355fea30fd..98d15f677b0a3beae9d79428079ab4cbf4a39c85 100644 (file)
--- 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 684464e7d84134696ae2678e0a3940651482c747..8332960b4d0c352a5c733c48f18f6474042ae686 100644 (file)
--- 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 2106a078c8d2a75658f2cee72816220ebd5e2a75..0535474386b546b1289936e3fc95e7184112ed13 100644 (file)
--- 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 38661a5e1a8b94ed96a42ce6c6fc9c125027e063..40b79821a478aefb03097c7207a9bb818286d205 100644 (file)
--- 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);
 }