From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 14 May 2021 11:35:24 +0000 (+0200)
Subject: - rpz-triggers, fix memory allocation trouble on allocation error path.
X-Git-Tag: release-1.14.0rc1~62^2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9df16cf9b7c7bbfe127aa83f72a63054c3f1632;p=thirdparty%2Funbound.git

- rpz-triggers, fix memory allocation trouble on allocation error path.
---

diff --git a/services/rpz.c b/services/rpz.c
index c06e096ae..9c05e69a5 100644
--- a/services/rpz.c
+++ b/services/rpz.c
@@ -387,11 +387,15 @@ rpz_clear(struct rpz* r)
 {
 	/* must hold write lock on auth_zone */
 	local_zones_delete(r->local_zones);
+	r->local_zones = NULL;
 	local_zones_delete(r->nsdname_zones);
+	r->nsdname_zones = NULL;
 	respip_set_delete(r->respip_set);
+	r->respip_set = NULL;
 	rpz_clientip_synthesized_set_delete(r->client_set);
+	r->client_set = NULL;
 	rpz_clientip_synthesized_set_delete(r->ns_set);
-	// XXX: this approach seems to leak memory
+	r->ns_set = NULL;
 	if(!(r->local_zones = local_zones_create())){
 		return 0;
 	}