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

diff --git a/services/rpz.c b/services/rpz.c
index c06e096ae2f57d54d92a09f3155929d56827af31..9c05e69a5849b453b9b2d06fcc6bc2533372431b 100644 (file)
--- 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;
        }