mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-02 07:35:26 +00:00
Code Issues Releases Wiki Activity

Merge branch '3258-cid-351370-cid-351371-after-adb-refactoring' into 'main'

Browse Source 
Resolve "CID 351370 & CID 351371 after ADB refactoring"

Closes #3258

See merge request isc-projects/bind9!6089
This commit is contained in:
Mark Andrews
2022-04-06 07:33:19 +00:00
parent 4d57ef0c49 ed1e480c53
commit 6d94ac9f96
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/dns/adb.c
View File

@@ -2612,18 +2612,16 @@ post_copy:
find->result_v4 = find_err_map[adbname->fetch_err]; find->result_v4 = find_err_map[adbname->fetch_err];
find->result_v6 = find_err_map[adbname->fetch6_err]; find->result_v6 = find_err_map[adbname->fetch6_err];
if (find != NULL) { if (want_event) {
if (want_event) { INSIST((find->flags & DNS_ADBFIND_ADDRESSMASK) != 0);
INSIST((find->flags & DNS_ADBFIND_ADDRESSMASK) != 0); isc_task_attach(task, &(isc_task_t *){ NULL });
isc_task_attach(task, &(isc_task_t *){ NULL }); find->event.ev_sender = task;
find->event.ev_sender = task; find->event.ev_action = action;
find->event.ev_action = action; find->event.ev_arg = arg;
find->event.ev_arg = arg;
}
*findp = find;
} }
*findp = find;
UNLOCK(&nbucket->lock); UNLOCK(&nbucket->lock);
return (result); return (result);
} }
@@ -2689,14 +2687,14 @@ dns_adb_cancelfind(dns_adbfind_t *find) {
adbname = find->adbname; adbname = find->adbname;
find->adbname = NULL; find->adbname = NULL;
nbucket = adbname->bucket; nbucket = adbname->bucket;
UNLOCK(&find->lock);
UNLOCK(&find->lock);
LOCK(&nbucket->lock); LOCK(&nbucket->lock);
ISC_LIST_UNLINK(adbname->finds, find, plink); ISC_LIST_UNLINK(adbname->finds, find, plink);
UNLOCK(&nbucket->lock); UNLOCK(&nbucket->lock);
LOCK(&find->lock);
cleanup: cleanup:
LOCK(&find->lock);
if (!FIND_EVENTSENT(find)) { if (!FIND_EVENTSENT(find)) {
ev = &find->event; ev = &find->event;
task = ev->ev_sender; task = ev->ev_sender;