diff --git a/lib/dns/qp.c b/lib/dns/qp.c index aa717c1301..d27726d74f 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 9ecc68bb6c..6231b4f442 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