From: Ondřej Surý <ondrej@isc.org>
Date: Sat, 14 Mar 2026 07:20:05 +0000 (+0100)
Subject: Clean up frdataset in resume_dslookup() on shutdown
X-Git-Tag: v9.21.21~4^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a339cfca42217588ec0d00f561fdf62dfc2aeaa;p=thirdparty%2Fbind9.git

Clean up frdataset in resume_dslookup() on shutdown

When resume_dslookup() receives ISC_R_SHUTTINGDOWN or ISC_R_CANCELED,
frdataset (fctx->nsrrset) was not disassociated.  While fctx__destroy()
eventually cleans it up, leaving it associated keeps the underlying DB
node referenced longer than necessary.
---

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index ab4344d74aa..11a57ca681b 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -7095,6 +7095,7 @@ resume_dslookup(void *arg) {
 
 	case ISC_R_SHUTTINGDOWN:
 	case ISC_R_CANCELED:
+		dns_rdataset_cleanup(frdataset);
 		goto cleanup;
 
 	default: