mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 13:38:26 +00:00
Code Issues Releases Wiki Activity

prevent TSAN being trigged when DNS_RBTFIND_EMPTYDATA is set

Browse Source
This commit is contained in:
Mark Andrews 2019-08-02 07:58:36 +10:00 committed by Ondřej Surý
parent 9b5969eab0
commit 7f30540727
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/dns/rbt.c
View File

@ -1652,9 +1652,11 @@ dns_rbt_findnode(dns_rbt_t *rbt, const dns_name_t *name, dns_name_t *foundname,
/*
* This might be the closest enclosing name.
*/
if (DATA(current) != NULL ||
(options & DNS_RBTFIND_EMPTYDATA) != 0)
if ((options & DNS_RBTFIND_EMPTYDATA) != 0 ||
DATA(current) != NULL)
{
*node = current;
}
/*
* Point the chain to the next level. This
@ -1725,8 +1727,8 @@ dns_rbt_findnode(dns_rbt_t *rbt, const dns_name_t *name, dns_name_t *foundname,
* ISC_R_SUCCESS to indicate an exact match.
*/
if (current != NULL && (options & DNS_RBTFIND_NOEXACT) == 0 &&
(DATA(current) != NULL ||
(options & DNS_RBTFIND_EMPTYDATA) != 0)) {
((options & DNS_RBTFIND_EMPTYDATA) != 0 || DATA(current) != NULL))
{
/*
* Found an exact match.
*/