From: Mark Andrews <marka@isc.org>
Date: Fri, 17 Oct 2025 04:24:04 +0000 (+1100)
Subject: Fix parse_dnskey in bin/dnssec/dnssec-ksr.c was failing to reset comments
X-Git-Tag: v9.21.15~55^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a949184eb73056228d91a95a51ce66f0fb590072;p=thirdparty%2Fbind9.git

Fix parse_dnskey in bin/dnssec/dnssec-ksr.c was failing to reset comments

If dns_name_fromtext failed or the subsequent dns_name_compare
failed the lexer's comments state wasn't cleaned up.
---

diff --git a/bin/dnssec/dnssec-ksr.c b/bin/dnssec/dnssec-ksr.c
index 787ffe4ff30..bea88940452 100644
--- a/bin/dnssec/dnssec-ksr.c
+++ b/bin/dnssec/dnssec-ksr.c
@@ -986,10 +986,11 @@ parse_dnskey(isc_lex_t *lex, char *owner, isc_buffer_t *buf, dns_ttl_t *ttl) {
 	isc_buffer_add(&b, strlen(owner));
 	ret = dns_name_fromtext(dname, &b, dns_rootname, 0);
 	if (ret != ISC_R_SUCCESS) {
-		return ret;
+		goto cleanup;
 	}
 	if (dns_name_compare(dname, name) != 0) {
-		return DNS_R_BADOWNERNAME;
+		ret = DNS_R_BADOWNERNAME;
+		goto cleanup;
 	}
 	isc_buffer_clear(&b);