From 174355101e0600288ff3853ca990734b506049ae Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Fri, 17 Oct 2025 15:24:04 +1100 Subject: [PATCH] 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. (cherry picked from commit a949184eb73056228d91a95a51ce66f0fb590072) --- bin/dnssec/dnssec-ksr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/dnssec/dnssec-ksr.c b/bin/dnssec/dnssec-ksr.c index 8471398431..3d35588708 100644 --- a/bin/dnssec/dnssec-ksr.c +++ b/bin/dnssec/dnssec-ksr.c @@ -1012,10 +1012,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, NULL); 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);