mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-08-30 22:15:20 +00:00
Merge branch '2211-tsan-error-previous_closest_nsec-dns_rbt_findnode-vs-subtractrdataset' into 'main'
Resolve "tsan error previous_closest_nsec(dns_rbt_findnode) vs subtractrdataset" Closes #2211 See merge request isc-projects/bind9!4259
This commit is contained in:
@@ -3709,7 +3709,7 @@ previous_closest_nsec(dns_rdatatype_t type, rbtdb_search_t *search,
|
|||||||
nsecnode = NULL;
|
nsecnode = NULL;
|
||||||
result = dns_rbt_findnode(
|
result = dns_rbt_findnode(
|
||||||
search->rbtdb->nsec, target, NULL, &nsecnode,
|
search->rbtdb->nsec, target, NULL, &nsecnode,
|
||||||
nsecchain, DNS_RBTFIND_NOOPTIONS, NULL, NULL);
|
nsecchain, DNS_RBTFIND_EMPTYDATA, NULL, NULL);
|
||||||
if (result == ISC_R_SUCCESS) {
|
if (result == ISC_R_SUCCESS) {
|
||||||
/*
|
/*
|
||||||
* Since this was the first loop, finding the
|
* Since this was the first loop, finding the
|
||||||
@@ -3759,7 +3759,7 @@ previous_closest_nsec(dns_rdatatype_t type, rbtdb_search_t *search,
|
|||||||
*nodep = NULL;
|
*nodep = NULL;
|
||||||
result = dns_rbt_findnode(search->rbtdb->tree, target, NULL,
|
result = dns_rbt_findnode(search->rbtdb->tree, target, NULL,
|
||||||
nodep, &search->chain,
|
nodep, &search->chain,
|
||||||
DNS_RBTFIND_NOOPTIONS, NULL, NULL);
|
DNS_RBTFIND_EMPTYDATA, NULL, NULL);
|
||||||
if (result == ISC_R_SUCCESS) {
|
if (result == ISC_R_SUCCESS) {
|
||||||
return (result);
|
return (result);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user