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

- Fix static analysis warnings about localzone locks that are unused.

Browse source
This commit is contained in:
W.C.A. Wijngaards 2021-08-04 10:58:08 +02:00
parent 8878680898
commit c9bb0604db
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/Changelog
View file

@ -7,6 +7,7 @@
4 August 2021: Wouter 4 August 2021: Wouter
- In unit test use openssl set security level to allow keys in test. - In unit test use openssl set security level to allow keys in test.
- Fix static analysis warnings about localzone locks that are unused.
3 August 2021: George 3 August 2021: George
- Listen to read or write events after the SSL handshake. - Listen to read or write events after the SSL handshake.

16
services/localzone.c
View file

@ -745,9 +745,15 @@ static int
lz_enter_zones(struct local_zones* zones, struct config_file* cfg) lz_enter_zones(struct local_zones* zones, struct config_file* cfg)
{ {
struct config_str2list* p; struct config_str2list* p;
#ifndef THREADS_DISABLED
struct local_zone* z; struct local_zone* z;
#endif
for(p = cfg->local_zones; p; p = p->next) { for(p = cfg->local_zones; p; p = p->next) {
if(!(z=lz_enter_zone(zones, p->str, p->str2, if(!(
#ifndef THREADS_DISABLED
z=
#endif
lz_enter_zone(zones, p->str, p->str2,
LDNS_RR_CLASS_IN))) LDNS_RR_CLASS_IN)))
return 0; return 0;
lock_rw_unlock(&z->lock); lock_rw_unlock(&z->lock);
@ -1027,7 +1033,9 @@ lz_setup_implicit(struct local_zones* zones, struct config_file* cfg)
} }
if(have_name) { if(have_name) {
uint8_t* n2; uint8_t* n2;
#ifndef THREADS_DISABLED
struct local_zone* z; struct local_zone* z;
#endif
/* allocate zone of smallest shared topdomain to contain em */ /* allocate zone of smallest shared topdomain to contain em */
n2 = nm; n2 = nm;
dname_remove_labels(&n2, &nmlen, nmlabs - match); dname_remove_labels(&n2, &nmlen, nmlabs - match);
@ -1039,7 +1047,11 @@ lz_setup_implicit(struct local_zones* zones, struct config_file* cfg)
} }
log_nametypeclass(VERB_ALGO, "implicit transparent local-zone", log_nametypeclass(VERB_ALGO, "implicit transparent local-zone",
n2, 0, dclass); n2, 0, dclass);
if(!(z=lz_enter_zone_dname(zones, n2, nmlen, match, if(!(
#ifndef THREADS_DISABLED
z=
#endif
lz_enter_zone_dname(zones, n2, nmlen, match,
local_zone_transparent, dclass))) { local_zone_transparent, dclass))) {
return 0; return 0;
} }