- Fix to clean memory leak of respip_addr.lock when ip_tree deleted.

diff --git a/doc/Changelog b/doc/Changelog
index dfa0ff001eb878412e11e87d005fea11d5cdf52f..0a7807ca127e873f6f400a9a1a738db70856342b 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,7 @@
        - Fix with libnettle make test with dsa disabled.
        - Fix contrib/fastrpz.patch to apply cleanly.  Fix for serve-stale
          fixes, but it does not compile, conflicts with new rpz code.
+       - Fix to clean memory leak of respip_addr.lock when ip_tree deleted.
 
 10 February 2020: George
        - Document 'ub_result.was_ratelimited' in libunbound.

diff --git a/respip/respip.c b/respip/respip.c
index e47171f851be47d59ff874f257a78eb7d3992e6f..e9b7d5dbf9d9c248cee6572fd074bc91d2091e8e 100644 (file)
--- a/respip/respip.c
+++ b/respip/respip.c
@@ -69,12 +69,21 @@ respip_set_create(void)
        return set;
 }
 
+/** helper traverse to delete resp_addr nodes */
+static void
+resp_addr_del(rbnode_type* n, void* ATTR_UNUSED(arg))
+{
+       struct resp_addr* r = (struct resp_addr*)n->key;
+       lock_rw_destroy(&r->lock);
+}
+
 void
 respip_set_delete(struct respip_set* set)
 {
        if(!set)
                return;
        lock_rw_destroy(&set->lock);
+       traverse_postorder(&set->ip_tree, resp_addr_del, NULL);
        regional_destroy(set->region);
        free(set);
 }