From: Ondřej Surý <ondrej@isc.org>
Date: Sat, 13 Sep 2025 04:10:29 +0000 (+0200)
Subject: Use result of first_*_header() calls instead of direct value
X-Git-Tag: v9.21.14~39^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=136fddf5387f56ce5c954d068cfff141090f50ae;p=thirdparty%2Fbind9.git

Use result of first_*_header() calls instead of direct value

Fix places where we got the header by calling first_*_header() function,
but then worked with top->header instead of the result.
---

diff --git a/lib/dns/qpcache.c b/lib/dns/qpcache.c
index 0d0e9b1bd2b..06d9a91b044 100644
--- a/lib/dns/qpcache.c
+++ b/lib/dns/qpcache.c
@@ -474,7 +474,7 @@ first_header(dns_slabtop_t *top) {
 static dns_slabheader_t *
 first_existing_header(dns_slabtop_t *top) {
 	dns_slabheader_t *header = first_header(top);
-	if (EXISTS(top->header)) {
+	if (EXISTS(header)) {
 		return header;
 	}
 	return NULL;
@@ -2933,7 +2933,7 @@ add(qpcache_t *qpdb, qpcnode_t *qpnode, dns_slabheader_t *newheader,
 			dns_slabheader_t *expireheader =
 				first_header(expiretop);
 			if (expireheader != NULL) {
-				mark_ancient(expiretop->header);
+				mark_ancient(expireheader);
 			}
 			/*
 			 * FIXME: In theory, we should mark the RRSIG