From: Ondřej Surý <ondrej@sury.org>
Date: Wed, 11 Mar 2026 12:17:32 +0000 (+0100)
Subject: Fix memory leak in dns_catz_options_setdefault() for zonedir
X-Git-Tag: v9.21.21~45^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cd17c8adc2720b26e8d76599b7f7786f1c854ad;p=thirdparty%2Fbind9.git

Fix memory leak in dns_catz_options_setdefault() for zonedir

When defaults->zonedir is set, opts->zonedir is unconditionally
overwritten without freeing the previous value. This leaks memory
on every catalog zone update when zonedir defaults are configured.

Free the existing opts->zonedir before replacing it.
---

diff --git a/lib/dns/catz.c b/lib/dns/catz.c
index 6e166212040..970ffbcba1a 100644
--- a/lib/dns/catz.c
+++ b/lib/dns/catz.c
@@ -225,6 +225,9 @@ dns_catz_options_setdefault(isc_mem_t *mctx, const dns_catz_options_t *defaults,
 	}
 
 	if (defaults->zonedir != NULL) {
+		if (opts->zonedir != NULL) {
+			isc_mem_free(mctx, opts->zonedir);
+		}
 		opts->zonedir = isc_mem_strdup(mctx, defaults->zonedir);
 	}