From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 30 Sep 2020 09:43:46 +0000 (+0200)
Subject: - Fix memory leak of edns tags at libunbound context delete.
X-Git-Tag: release-1.12.0rc1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46b3440aea6c15be935d015648b706084a641fd9;p=thirdparty%2Funbound.git

- Fix memory leak of edns tags at libunbound context delete.
---

diff --git a/doc/Changelog b/doc/Changelog
index 3dd45963a..aba2a9ae2 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -4,6 +4,7 @@
 	- Fix stream_ssl, ssl_req_order and ssl_req_timeout tests for
 	  alloc check debug output.
 	- Easier kill of unbound-dnstap-socket tool in test.
+	- Fix memory leak of edns tags at libunbound context delete.
 
 29 September 2020: Ralph
 	- DNS Flag Day 2020: change edns-buffer-size default to 1232.
diff --git a/libunbound/libunbound.c b/libunbound/libunbound.c
index af26e5546..3922eb041 100644
--- a/libunbound/libunbound.c
+++ b/libunbound/libunbound.c
@@ -186,6 +186,7 @@ ub_ctx_create(void)
 		config_delete(ctx->env->cfg);
 		modstack_desetup(&ctx->mods, ctx->env);
 		edns_known_options_delete(ctx->env);
+		edns_tags_delete(ctx->env->edns_tags);
 		free(ctx->env);
 		free(ctx);
 		errno = e;
@@ -198,6 +199,7 @@ ub_ctx_create(void)
 		config_delete(ctx->env->cfg);
 		modstack_desetup(&ctx->mods, ctx->env);
 		edns_known_options_delete(ctx->env);
+		edns_tags_delete(ctx->env->edns_tags);
 		free(ctx->env);
 		free(ctx);
 		errno = e;
@@ -336,6 +338,7 @@ ub_ctx_delete(struct ub_ctx* ctx)
 		infra_delete(ctx->env->infra_cache);
 		config_delete(ctx->env->cfg);
 		edns_known_options_delete(ctx->env);
+		edns_tags_delete(ctx->env->edns_tags);
 		auth_zones_delete(ctx->env->auth_zones);
 		free(ctx->env);
 	}