upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-08 23:02:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '4571-findnsec3proofs-failed-to-disassociate-all-rdatasets-returned-by-dns_ncache_current-bind-9.18' into 'bind-9.18'

Browse source 
[9.18] Resolve "findnsec3proofs failed to disassociate all rdatasets returned by dns_ncache_current"

See merge request isc-projects/bind9!8730
This commit is contained in:
Mark Andrews 2024-02-13 23:09:54 +00:00
commit 2044384f6d
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,3 +1,6 @@
6345. [bug] Added missing dns_rdataset_disassociate calls in
validator.c:findnsec3proofs. [GL #4571]
6343. [bug] Fix case insensitive setting for isc_ht hashtable.
[GL #4568]

12
lib/dns/validator.c
View file

@ -2230,6 +2230,9 @@ findnsec3proofs(dns_validator_t *val) {
POST(result);
if (dns_name_countlabels(zonename) == 0) {
if (dns_rdataset_isassociated(&trdataset)) {
dns_rdataset_disassociate(&trdataset);
}
return (ISC_R_SUCCESS);
}
@ -2299,6 +2302,9 @@ findnsec3proofs(dns_validator_t *val) {
{
proofs[DNS_VALIDATOR_NOWILDCARDPROOF] = name;
}
if (dns_rdataset_isassociated(&trdataset)) {
dns_rdataset_disassociate(&trdataset);
}
return (result);
}
if (result != ISC_R_SUCCESS) {
@ -2352,9 +2358,15 @@ findnsec3proofs(dns_validator_t *val) {
{
result = checkwildcard(val, dns_rdatatype_nsec3, zonename);
if (result != ISC_R_SUCCESS) {
if (dns_rdataset_isassociated(&trdataset)) {
dns_rdataset_disassociate(&trdataset);
}
return (result);
}
}
if (dns_rdataset_isassociated(&trdataset)) {
dns_rdataset_disassociate(&trdataset);
}
return (result);
}