From: W.C.A. Wijngaards Date: Mon, 18 Mar 2024 12:52:59 +0000 (+0100) Subject: - Fix rpz that copies the cname override completely to the temp X-Git-Tag: release-1.20.0rc1~60 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6b1f9a4c3cf4708fecff19ab8df9fb39eb701ae;p=thirdparty%2Funbound.git - Fix rpz that copies the cname override completely to the temp region, so there are no references to the rpz region. --- diff --git a/doc/Changelog b/doc/Changelog index fe106cdcb..9deac82ff 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -2,6 +2,8 @@ - Fix that rpz CNAME content is limited to the max number of cnames. - Fix rpz, it follows iterator CNAMEs for nsip and nsdname and sets the reply query_info values, that is better for debug logging. + - Fix rpz that copies the cname override completely to the temp + region, so there are no references to the rpz region. 15 March 2024: Yorgos - Merge #1030: Persist the openssl and expat directories for repeated diff --git a/services/rpz.c b/services/rpz.c index bcc0322bb..0637e3262 100644 --- a/services/rpz.c +++ b/services/rpz.c @@ -1888,8 +1888,7 @@ rpz_apply_cname_override_action(struct rpz* r, sizeof(struct local_rrset)); if(qinfo->local_alias == NULL) return 0; /* out of memory */ - qinfo->local_alias->rrset = regional_alloc_init(temp, - r->cname_override, sizeof(*r->cname_override)); + qinfo->local_alias->rrset = respip_copy_rrset(r->cname_override, temp); if(qinfo->local_alias->rrset == NULL) { qinfo->local_alias = NULL; return 0; /* out of memory */