From: Ondřej Surý <ondrej@isc.org>
Date: Tue, 16 Sep 2025 12:11:08 +0000 (+0200)
Subject: Fix dns_qpmulti_memusage() on empty dns_qpmulti_t instance
X-Git-Tag: v9.21.14~40^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b2f653b3320939cd08e3669e3a618d3224149db7;p=thirdparty%2Fbind9.git

Fix dns_qpmulti_memusage() on empty dns_qpmulti_t instance

The dns_qpmulti_memusage() causes assertion failure when called on
freshly created qpmulti instance because the qp->usage hasn't been
allocated yet.
---

diff --git a/lib/dns/qp.c b/lib/dns/qp.c
index aa717c13012..d27726d74f9 100644
--- a/lib/dns/qp.c
+++ b/lib/dns/qp.c
@@ -1124,7 +1124,7 @@ dns_qpmulti_memusage(dns_qpmulti_t *multi) {
 
 	dns_qp_memusage_t memusage = dns_qp_memusage(qp);
 
-	if (qp->transaction_mode == QP_UPDATE) {
+	if (qp->transaction_mode == QP_UPDATE && qp->usage != NULL) {
 		memusage.bytes -= qp->usage[qp->bump].capacity;
 		memusage.bytes += qp->usage[qp->bump].used *
 				  sizeof(dns_qpnode_t);
diff --git a/tests/dns/qpmulti_test.c b/tests/dns/qpmulti_test.c
index 9ecc68bb6c1..6231b4f4420 100644
--- a/tests/dns/qpmulti_test.c
+++ b/tests/dns/qpmulti_test.c
@@ -378,8 +378,22 @@ ISC_RUN_TEST_IMPL(qpmulti) {
 	isc_loopmgr_destroy();
 }
 
+ISC_RUN_TEST_IMPL(qpmulti_memusage) {
+	dns_qpmulti_t *qpm = NULL;
+	dns_qp_memusage_t mu;
+
+	dns_qpmulti_create(isc_g_mctx, &test_methods, NULL, &qpm);
+
+	mu = dns_qpmulti_memusage(qpm);
+	assert_int_equal(mu.leaves, 0);
+	assert_int_equal(mu.used, 0);
+
+	dns_qpmulti_destroy(&qpm);
+}
+
 ISC_TEST_LIST_START
 ISC_TEST_ENTRY(qpmulti)
+ISC_TEST_ENTRY(qpmulti_memusage)
 ISC_TEST_LIST_END
 
 ISC_TEST_MAIN