upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-23 16:20:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
git-svn-id: file:///svn/unbound/trunk@3580 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2015-12-11 10:26:15 +00:00
parent 2859b22f88
commit 72a5931a68
7 changed files with 15 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/Changelog
View file

@ -1,3 +1,6 @@
11 December 2015: Wouter
- remove NULL-checks before free, patch from Michael McConville.
10 December 2015: Wouter 10 December 2015: Wouter
- 1.5.7 release - 1.5.7 release
- trunk has 1.5.8 in development. - trunk has 1.5.8 in development.

3
testcode/replay.c
View file

@ -499,8 +499,7 @@ replay_scenario_delete(struct replay_scenario* scen)
struct replay_range* rng, *rngn; struct replay_range* rng, *rngn;
if(!scen) if(!scen)
return; return;
if(scen->title) free(scen->title);
free(scen->title);
mom = scen->mom_first; mom = scen->mom_first;
while(mom) { while(mom) {
momn = mom->mom_next; momn = mom->mom_next;

6
util/data/packed_rrset.c
View file

@ -57,11 +57,9 @@ ub_packed_rrset_parsedelete(struct ub_packed_rrset_key* pkey,
{ {
if(!pkey) if(!pkey)
return; return;
if(pkey->entry.data) free(pkey->entry.data);
free(pkey->entry.data);
pkey->entry.data = NULL; pkey->entry.data = NULL;
if(pkey->rk.dname) free(pkey->rk.dname);
free(pkey->rk.dname);
pkey->rk.dname = NULL; pkey->rk.dname = NULL;
pkey->id = 0; pkey->id = 0;
alloc_special_release(alloc, pkey); alloc_special_release(alloc, pkey);

9
util/mini_event.c
View file

@ -261,12 +261,9 @@ void event_base_free(struct event_base* base)
{ {
if(!base) if(!base)
return; return;
if(base->times) free(base->times);
free(base->times); free(base->fds);
if(base->fds) free(base->signals);
free(base->fds);
if(base->signals)
free(base->signals);
free(base); free(base);
} }

3
util/random.c
View file

@ -228,7 +228,6 @@ ub_random_max(struct ub_randstate* state, long int x)
void void
ub_randfree(struct ub_randstate* s) ub_randfree(struct ub_randstate* s)
{ {
if(s) free(s);
free(s);
/* user app must do RAND_cleanup(); */ /* user app must do RAND_cleanup(); */
} }

6
util/tube.c
View file

@ -118,10 +118,8 @@ void tube_remove_bg_listen(struct tube* tube)
comm_point_delete(tube->listen_com); comm_point_delete(tube->listen_com);
tube->listen_com = NULL; tube->listen_com = NULL;
} }
if(tube->cmd_msg) { free(tube->cmd_msg);
free(tube->cmd_msg); tube->cmd_msg = NULL;
tube->cmd_msg = NULL;
}
} }
void tube_remove_bg_write(struct tube* tube) void tube_remove_bg_write(struct tube* tube)

9
util/winsock_event.c
View file

@ -459,12 +459,9 @@ void event_base_free(struct event_base *base)
verbose(VERB_CLIENT, "winsock_event event_base_free"); verbose(VERB_CLIENT, "winsock_event event_base_free");
if(!base) if(!base)
return; return;
if(base->items) free(base->items);
free(base->items); free(base->times);
if(base->times) free(base->signals);
free(base->times);
if(base->signals)
free(base->signals);
free(base); free(base);
} }