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

Merge branch '3723-dont-shutdown-invalid-tasks-v9_18' into 'v9_18'

Browse source 
[v9.18] Don't cleanup uninitialized dns_resolver buckets

See merge request isc-projects/bind9!7286
This commit is contained in:
Ondřej Surý 2023-01-03 11:54:21 +00:00
commit f5e7192691
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/dns/resolver.c
View file

@ -10378,7 +10378,7 @@ dns_resolver_create(dns_view_t *view, isc_taskmgr_t *taskmgr,
.querydscp4 = -1,
.querydscp6 = -1 };
atomic_init(&res->activebuckets, ntasks);
atomic_init(&res->activebuckets, res->nbuckets);
isc_mem_attach(view->mctx, &res->mctx);
@ -10399,12 +10399,12 @@ dns_resolver_create(dns_view_t *view, isc_taskmgr_t *taskmgr,
}
if (view->resstats != NULL) {
isc_stats_set(view->resstats, ntasks,
isc_stats_set(view->resstats, res->nbuckets,
dns_resstatscounter_buckets);
}
res->buckets = isc_mem_get(view->mctx,
ntasks * sizeof(res->buckets[0]));
res->nbuckets * sizeof(res->buckets[0]));
for (uint32_t i = 0; i < ntasks; i++) {
res->buckets[i] = (fctxbucket_t){ 0 };
@ -10417,6 +10417,7 @@ dns_resolver_create(dns_view_t *view, isc_taskmgr_t *taskmgr,
result = isc_task_create_bound(taskmgr, 0,
&res->buckets[i].task, i);
if (result != ISC_R_SUCCESS) {
ntasks = i;
isc_mutex_destroy(&res->buckets[i].lock);
goto cleanup_buckets;
}