From: Colin Vidal <colin@isc.org>
Date: Fri, 17 Oct 2025 08:54:09 +0000 (+0200)
Subject: mem: checkfree assertion after debug list dump
X-Git-Tag: v9.21.15~57^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f4ff7dec42f2584d1176a30d0a63e8971f715f7;p=thirdparty%2Fbind9.git

mem: checkfree assertion after debug list dump

When a memory context is destroyed, if the `checkfree` property is set,
the program assert there is no remaining allocation. If there are and
assertions are enabled, the program immediately stops.

However, if memory trace/record debug is enabled, the dump of
outstanding allocation won't be printed as it is done after the
no remaining allocation assertion check.

This moves the no remaining allocation assertion check after the dump of
outstanding allocations, so it is still possible to figure out what's
still allocated by this memory context.
---

diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index d06a8dbb645..11d93f3ed65 100644
--- a/lib/isc/mem.c
+++ b/lib/isc/mem.c
@@ -553,14 +553,6 @@ mem_destroy(isc_mem_t *ctx) {
 	ISC_LIST_UNLINK(contexts, ctx, link);
 	UNLOCK(&contextslock);
 
-	if (ctx->checkfree) {
-		INSIST(isc_mem_inuse(ctx) == 0);
-	}
-
-	ctx->magic = 0;
-
-	INSIST(ISC_LIST_EMPTY(ctx->pools));
-
 #if ISC_MEM_TRACKLINES
 	if (ctx->debuglist != NULL) {
 		for (size_t i = 0; i < DEBUG_TABLE_COUNT; i++) {
@@ -582,6 +574,14 @@ mem_destroy(isc_mem_t *ctx) {
 	}
 #endif /* if ISC_MEM_TRACKLINES */
 
+	if (ctx->checkfree) {
+		INSIST(isc_mem_inuse(ctx) == 0);
+	}
+
+	ctx->magic = 0;
+
+	INSIST(ISC_LIST_EMPTY(ctx->pools));
+
 	free(ctx->name);
 
 	isc_mutex_destroy(&ctx->lock);