From: Mark Andrews <marka@isc.org>
Date: Wed, 20 Jan 2016 05:38:11 +0000 (+1100)
Subject: 4293.   [bug]           Address memory leak on priming query creation failure.
X-Git-Tag: v9.11.0a1~190
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=73fbd4c9d3e65621eb32a8e01659532f131de690;p=thirdparty%2Fbind9.git

4293.   [bug]           Address memory leak on priming query creation failure.
                        [RT #41512]
---

diff --git a/CHANGES b/CHANGES
index 74d51b8239a..64ac3395e22 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4293.	[bug]		Address memory leak on priming query creation failure.
+			[RT #41512]
+
 4292.	[placeholder]
 
 4291.	[cleanup]	Added a required include to dns/forward.h. [RT #41474]
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 0dfd32181f5..83c740a2d44 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -9054,6 +9054,7 @@ dns_resolver_prime(dns_resolver_t *res) {
 						  &res->primefetch);
 		UNLOCK(&res->primelock);
 		if (result != ISC_R_SUCCESS) {
+			isc_mem_put(res->mctx, rdataset, sizeof(*rdataset));
 			LOCK(&res->lock);
 			INSIST(res->priming);
 			res->priming = ISC_FALSE;