From: Witold Kręcicki <wpk@isc.org>
Date: Thu, 28 May 2020 10:34:37 +0000 (+0200)
Subject: Add missing isc_mutex_destroy and isc_conditional_destroy calls.
X-Git-Tag: v9.17.2~47^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a8807d9a7b25e14185d181abe1de12bf5d5a7af4;p=thirdparty%2Fbind9.git

Add missing isc_mutex_destroy and isc_conditional_destroy calls.

While harmless on Linux, missing isc_{mutex,conditional}_destroy
causes a memory leak on *BSD. Missing calls were added.
---

diff --git a/bin/named/server.c b/bin/named/server.c
index 5cb08d2e466..892b497a0d7 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -10086,6 +10086,7 @@ named_server_destroy(named_server_t **serverp) {
 	dst_lib_destroy();
 
 	isc_event_free(&server->reload_event);
+	isc_mutex_destroy(&server->reload_event_lock);
 
 	INSIST(ISC_LIST_EMPTY(server->kasplist));
 	INSIST(ISC_LIST_EMPTY(server->viewlist));
diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c
index 3f7723a1b42..a004d558045 100644
--- a/lib/isc/netmgr/netmgr.c
+++ b/lib/isc/netmgr/netmgr.c
@@ -276,6 +276,9 @@ nm_destroy(isc_nm_t **mgr0) {
 
 		isc_queue_destroy(worker->ievents);
 		isc_queue_destroy(worker->ievents_prio);
+		isc_mutex_destroy(&worker->lock);
+		isc_condition_destroy(&worker->cond);
+
 		isc_mem_put(mgr->mctx, worker->recvbuf,
 			    ISC_NETMGR_RECVBUF_SIZE);
 		isc_thread_join(worker->thread, NULL);
@@ -771,6 +774,8 @@ nmsocket_cleanup(isc_nmsocket_t *sock, bool dofree) {
 
 	isc_mem_free(sock->mgr->mctx, sock->ah_frees);
 	isc_mem_free(sock->mgr->mctx, sock->ah_handles);
+	isc_mutex_destroy(&sock->lock);
+	isc_condition_destroy(&sock->cond);
 
 	if (dofree) {
 		isc_nm_t *mgr = sock->mgr;
diff --git a/lib/isc/task.c b/lib/isc/task.c
index 5d9cef42ecb..c0a51793751 100644
--- a/lib/isc/task.c
+++ b/lib/isc/task.c
@@ -1356,9 +1356,12 @@ static void
 manager_free(isc__taskmgr_t *manager) {
 	for (unsigned int i = 0; i < manager->workers; i++) {
 		isc_mutex_destroy(&manager->queues[i].lock);
+		isc_condition_destroy(&manager->queues[i].work_available);
 	}
 	isc_mutex_destroy(&manager->lock);
+	isc_mutex_destroy(&manager->excl_lock);
 	isc_mutex_destroy(&manager->halt_lock);
+	isc_condition_destroy(&manager->halt_cond);
 	isc_mem_put(manager->mctx, manager->queues,
 		    manager->workers * sizeof(isc__taskqueue_t));
 	manager->common.impmagic = 0;