Merge branch '2114-cid-306652-null-pointer-dereferences-reverse_inull' into 'main'

Resolve "CID 306652:  Null pointer dereferences  (REVERSE_INULL)"

Closes #2114

See merge request isc-projects/bind9!4099
This commit is contained in:
Mark Andrews 2020-09-09 21:51:49 +00:00
commit 0a8fc4062d

View file

@ -3771,13 +3771,11 @@ cleanup_thread(isc_mem_t *mctx, isc__socketthread_t *thread) {
isc_mem_put(thread->manager->mctx, thread->fdstate,
thread->manager->maxsocks * sizeof(int));
if (thread->fdlock != NULL) {
for (i = 0; i < FDLOCK_COUNT; i++) {
isc_mutex_destroy(&thread->fdlock[i]);
}
isc_mem_put(thread->manager->mctx, thread->fdlock,
FDLOCK_COUNT * sizeof(isc_mutex_t));
for (i = 0; i < FDLOCK_COUNT; i++) {
isc_mutex_destroy(&thread->fdlock[i]);
}
isc_mem_put(thread->manager->mctx, thread->fdlock,
FDLOCK_COUNT * sizeof(isc_mutex_t));
}
isc_result_t