From: Evan Hunt <each@isc.org>
Date: Fri, 5 Jan 2018 01:56:43 +0000 (-0800)
Subject: [v9_12_0_patch] mem.c failed to compile if ISC_MEM_CHECKOVERRUN=0
X-Git-Tag: v9.12.0rc2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45c32001a4d6662501b8336fceec228a5d324e01;p=thirdparty%2Fbind9.git

[v9_12_0_patch] mem.c failed to compile if ISC_MEM_CHECKOVERRUN=0

(cherry picked from commit 4c33e133ca7eb0aa65986f0ea5d788007e70aaa9)
(cherry picked from commit 879e17b77df92171c9ef4a54f60b7436e7a854fa)
---

diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index e14e4597a1f..f88de86e7aa 100644
--- a/lib/isc/mem.c
+++ b/lib/isc/mem.c
@@ -774,8 +774,9 @@ mem_get(isc__mem_t *ctx, size_t size) {
 	if (ISC_UNLIKELY((ctx->flags & ISC_MEMFLAG_FILL) != 0)) {
 		if (ISC_LIKELY(ret != NULL))
 			memset(ret, 0xbe, size); /* Mnemonic for "beef". */
-	} else {
+	}
 #if ISC_MEM_CHECKOVERRUN
+	else {
 		if (ISC_LIKELY(ret != NULL))
 			ret[size-1] = 0xbe;
 	}