From: Mark Andrews <marka@isc.org>
Date: Mon, 2 Jun 2014 06:31:42 +0000 (+1000)
Subject: 3868.   [bug]           isc_mem_setwater incorrectly cleared hi_called
X-Git-Tag: v9.11.0a1~1581
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=50a745417461a4c007248202bb3a8bf7be426813;p=thirdparty%2Fbind9.git

3868.   [bug]           isc_mem_setwater incorrectly cleared hi_called
                        potentially leaving over memory cleaner running.
                        [RT #35270]
---

diff --git a/CHANGES b/CHANGES
index 048da3a3c7e..d5718500ff6 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]
+
 3867.	[func]		"rndc nta" can now be used to set a temporary
 			negative trust anchor, which disables DNSSEC
 			validation below a specified name for a specified
diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index 93e2c2c9b90..46df64f4efe 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);