From: Mark Andrews <marka@isc.org>
Date: Tue, 14 Oct 2025 00:26:45 +0000 (+1100)
Subject: Fix parse_rr in lib/dns/skr.c was failing to reset the comments
X-Git-Tag: v9.21.15~67^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e5ceda617dcc5ba1d26f20bd30d28a9cf0be3dcf;p=thirdparty%2Fbind9.git

Fix parse_rr in lib/dns/skr.c was failing to reset the 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/lib/dns/skr.c b/lib/dns/skr.c
index ab08ec1cd8b..537683d363e 100644
--- a/lib/dns/skr.c
+++ b/lib/dns/skr.c
@@ -74,10 +74,11 @@ parse_rr(isc_lex_t *lex, isc_mem_t *mctx, char *owner, dns_name_t *origin,
 	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, origin) != 0) {
-		return DNS_R_BADOWNERNAME;
+		ret = DNS_R_BADOWNERNAME;
+		goto cleanup;
 	}
 	isc_buffer_clear(&b);