From: Aram Sargsyan <aram@isc.org>
Date: Fri, 22 Sep 2023 16:01:08 +0000 (+0000)
Subject: Don't use the statslock in the destructor
X-Git-Tag: v9.19.18~64^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=903a79f6ce9bd466c64068cb907479c8b45dc5fc;p=thirdparty%2Fbind9.git

Don't use the statslock in the destructor

Using the 'statslock' mutex in the destructor is useless, because
at this point there shouldn't be any other references to the
structure.
---

diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c
index d818aca33eb..2487b0c72af 100644
--- a/lib/dns/xfrin.c
+++ b/lib/dns/xfrin.c
@@ -1899,7 +1899,6 @@ xfrin_destroy(dns_xfrin_t *xfr) {
 	 * Calculate the length of time the transfer took,
 	 * and print a log message with the bytes and rate.
 	 */
-	LOCK(&xfr->statslock);
 	msecs = isc_time_microdiff(&now, &xfr->start) / 1000;
 	if (msecs == 0) {
 		msecs = 1;
@@ -1912,8 +1911,6 @@ xfrin_destroy(dns_xfrin_t *xfr) {
 		  xfr->nmsg, xfr->nrecs, xfr->nbytes,
 		  (unsigned int)(msecs / 1000), (unsigned int)(msecs % 1000),
 		  (unsigned int)persec, xfr->end_serial);
-	UNLOCK(&xfr->statslock);
-	isc_mutex_destroy(&xfr->statslock);
 
 	if (xfr->dispentry != NULL) {
 		dns_dispatch_done(&xfr->dispentry);
@@ -1989,6 +1986,7 @@ xfrin_destroy(dns_xfrin_t *xfr) {
 
 	isc_timer_destroy(&xfr->max_idle_timer);
 	isc_timer_destroy(&xfr->max_time_timer);
+	isc_mutex_destroy(&xfr->statslock);
 
 	isc_mem_putanddetach(&xfr->mctx, xfr, sizeof(*xfr));
 }