From: Evan Hunt <each@isc.org>
Date: Mon, 4 Jul 2022 14:02:12 +0000 (+0200)
Subject: Add missing isc_refcount_*() calls
X-Git-Tag: v9.19.3~11^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=975a5a98cf16317423be751666c232d458053cbc;p=thirdparty%2Fbind9.git

Add missing isc_refcount_*() calls

Commits 76bcb4d16b776e25cc67937f7d1a2fe6e365cfd7 and
d48d8e1cf0879b818d710cc1238643610e386d38 did not include
isc_refcount_destroy() calls that would be logical counterparts of the
isc_refcount_init() calls these commits added.  Add the missing
isc_refcount_destroy() calls to destroy().

Adding these calls (which ensure a given structure's reference count
equals 0 when it is destroyed, therefore detecting reference counting
issues) uncovered another flaw in the commits mentioned above: missing
isc_refcount_decrement() calls that would be logical counterparts of the
isc_refcount_increment*() calls these commits added.  Add the missing
isc_refcount_decrement() calls to unlink_name() and unlink_entry().
---

diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index 95ca2d40709..98c25854df8 100644
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -871,6 +871,8 @@ unlink_name(dns_adbname_t *name) {
 	} else {
 		ISC_LIST_UNLINK(nbucket->names, name, plink);
 	}
+
+	isc_refcount_decrement(&nbucket->references);
 }
 
 /*
@@ -944,6 +946,8 @@ unlink_entry(dns_adbentry_t *entry) {
 	} else {
 		ISC_LIST_UNLINK(ebucket->entries, entry, plink);
 	}
+
+	isc_refcount_decrement(&ebucket->references);
 }
 
 static void
@@ -2056,6 +2060,7 @@ destroy(dns_adb_t *adb) {
 		isc_ht_iter_current(it, (void **)&nbucket);
 		cleanup_names(nbucket, INT_MAX);
 		isc_mutex_destroy(&nbucket->lock);
+		isc_refcount_destroy(&nbucket->references);
 		isc_mem_put(adb->mctx, nbucket, sizeof(*nbucket));
 	}
 	isc_ht_iter_destroy(&it);
@@ -2072,6 +2077,7 @@ destroy(dns_adb_t *adb) {
 		isc_ht_iter_current(it, (void **)&ebucket);
 		cleanup_entries(ebucket, INT_MAX);
 		isc_mutex_destroy(&ebucket->lock);
+		isc_refcount_destroy(&ebucket->references);
 		isc_mem_put(adb->mctx, ebucket, sizeof(*ebucket));
 	}
 	isc_ht_iter_destroy(&it);
@@ -2080,6 +2086,7 @@ destroy(dns_adb_t *adb) {
 	isc_rwlock_destroy(&adb->entries_lock);
 
 	isc_mutex_destroy(&adb->lock);
+	isc_refcount_destroy(&adb->references);
 
 	isc_task_detach(&adb->task);
 	isc_stats_detach(&adb->stats);