Merge branch '2142-write-after-free-in-unit-test-lib-ns-tests-query_test-c' into 'main'

Resolve "write after free in unit test lib/ns/tests/query_test.c"

Closes #2142

See merge request isc-projects/bind9!4116

.gitlab-ci.yml

@@ -341,7 +341,6 @@ stages:
 
 .unit_test_tsan: &unit_test_tsan_job
   <<: *unit_test_common
-  allow_failure: true
   after_script:
     - find lib -name 'tsan.*' -exec python3 util/parse_tsan.py {} \;
   artifacts:

lib/ns/tests/nstest.c

@@ -107,6 +107,8 @@ __wrap_isc_nmhandle_detach(isc_nmhandle_t **handlep) {
 	ns_client_t *client = (ns_client_t *)handle;
 	int i;
 
+	*handlep = NULL;
+
 	for (i = 0; i < 32; i++) {
 		if (atomic_load(&client_addrs[i]) == (uintptr_t)client) {
 			break;
@@ -122,7 +124,6 @@ __wrap_isc_nmhandle_detach(isc_nmhandle_t **handlep) {
 		isc_mem_put(mctx, client, sizeof(ns_client_t));
 	}
 
-	*handlep = NULL;
 	return;
 }