From a27fdeeef25a6232383e2d578f95660676b0a9e3 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Mon, 2 Jun 2014 16:31:42 +1000
Subject: [PATCH] 3868.   [bug]           isc_mem_setwater incorrectly cleared
 hi_called                         potentially leaving over memory cleaner
 running.                         [RT #35270]

---
 CHANGES       | 4 ++++
 lib/isc/mem.c | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 240d8f7b59..ce7488ab42 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+3868.	[bug]		isc_mem_setwater incorrectly cleared hi_called
+			potentially leaving over memory cleaner running.
+			[RT #35270]
+
 3866.	[bug]		Named could die on disk full in generate_session_key.
 			[RT #36119]
 
diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index 93e2c2c9b9..46df64f4ef 100644
--- a/lib/isc/mem.c
+++ b/lib/isc/mem.c
@@ -1785,7 +1785,6 @@ isc__mem_setwater(isc_mem_t *ctx0, isc_mem_water_t water, void *water_arg,
 		ctx->water_arg = water_arg;
 		ctx->hi_water = hiwater;
 		ctx->lo_water = lowater;
-		ctx->hi_called = ISC_FALSE;
 	}
 	MCTXUNLOCK(ctx, &ctx->lock);