From 2490e43c67a8c00982272324f46b72cdada2c8a4 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 11 Apr 2012 10:44:24 +1000
Subject: [PATCH] 3304.   [bug]           Use hmctx, not mctx when freeing
 rbtdb->heaps. [RT #28571]

---
 CHANGES         | 2 ++
 lib/dns/rbtdb.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index fe73172181..ffbababe04 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3304.	[bug]		Use hmctx, not mctx when freeing rbtdb->heaps. [RT #28571]
+
 3303.	[bug]		named could die when reloading. [RT #28606]
 
 3302.	[bug]		dns_dnssec_findmatchingkeys could fail to find
diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index aaf9306286..5bae6c48e1 100644
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -7818,7 +7818,7 @@ dns_rbtdb_create
 		for (i = 0 ; i < (int)rbtdb->node_lock_count ; i++)
 			if (rbtdb->heaps[i] != NULL)
 				isc_heap_destroy(&rbtdb->heaps[i]);
-		isc_mem_put(mctx, rbtdb->heaps,
+		isc_mem_put(hmctx, rbtdb->heaps,
 			    rbtdb->node_lock_count * sizeof(isc_heap_t *));
 	}