ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Destroy task first when destroying catzs.

Browse Source 
When freeing catzs structures we need to kill the updater task first.
    Otherwise we might race with the updater and there might be a crash
    on shutdown.
This commit is contained in:
Ondřej Surý
2018-10-30 13:41:07 +01:00
parent 541872bf3b
commit c1d111cd2e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/dns/catz.c
View File

@@ -795,7 +795,7 @@ dns_catz_catzs_detach(dns_catz_zones_t **catzsp) {
*catzsp = NULL;
if (isc_refcount_decrement(&catzs->refs) == 1) {
isc_refcount_destroy(&catzs->refs);
isc_task_destroy(&catzs->updater);
DESTROYLOCK(&catzs->lock);
if (catzs->zones != NULL) {
isc_ht_iter_t *iter = NULL;
@@ -815,7 +815,7 @@ dns_catz_catzs_detach(dns_catz_zones_t **catzsp) {
INSIST(isc_ht_count(catzs->zones) == 0);
isc_ht_destroy(&catzs->zones);
}
isc_task_destroy(&catzs->updater);
isc_refcount_destroy(&catzs->refs);
isc_mem_putanddetach(&catzs->mctx, catzs, sizeof(*catzs));
}
}