upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-03-15 15:12:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '3900-catz-error-path-issues' into 'v9_18'

Browse source 
[9.18] Resolve "Error path cleanup issues in dns_catz_new_zones() and dns_catz_new_zone()"

See merge request isc-projects/bind9!7605
This commit is contained in:
Arаm Sаrgsyаn 2023-02-27 14:07:34 +00:00
commit ca9bbd43c6
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,3 +1,6 @@
6116. [bug] Fix error path cleanup issues in dns_catz_new_zones()
and dns_catz_new_zone() functions. [GL #3900]
6105. [bug] Detach 'rpzs' and 'catzs' from the previous view in
configure_rpz() and configure_catz(), respectively,
just after attaching it to the new view. [GL #3880]

3
lib/dns/catz.c
View file

@ -779,7 +779,7 @@ cleanup_ht:
isc_ht_destroy(&new_zones->zones);
isc_refcount_destroy(&new_zones->refs);
isc_mutex_destroy(&new_zones->lock);
isc_mem_put(mctx, new_zones, sizeof(*new_zones));
isc_mem_putanddetach(&new_zones->mctx, new_zones, sizeof(*new_zones));
return (result);
}
@ -842,6 +842,7 @@ dns_catz_new_zone(dns_catz_zones_t *catzs, dns_catz_zone_t **zonep,
cleanup_ht:
isc_ht_destroy(&new_zone->entries);
isc_ht_destroy(&new_zone->coos);
dns_name_free(&new_zone->name, catzs->mctx);
isc_mem_put(catzs->mctx, new_zone, sizeof(*new_zone));