From d70cb26231a94133f221e7dccb1983a8c9116823 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Tue, 14 Oct 2025 11:26:45 +1100
Subject: [PATCH] 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.

(cherry picked from commit e5ceda617dcc5ba1d26f20bd30d28a9cf0be3dcf)
---
 lib/dns/skr.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/dns/skr.c b/lib/dns/skr.c
index 51038ced4e..b7a977f283 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, NULL);
 	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);