From: Mark Andrews <marka@isc.org>
Date: Fri, 5 Jan 2018 01:13:17 +0000 (+1100)
Subject: mem.c failed to compile if ISC_MEM_CHECKOVERRUN=0
X-Git-Tag: v9.13.0~293
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a922385850f6d790d24e1db2b0ca025c20b9c2b7;p=thirdparty%2Fbind9.git

mem.c failed to compile if ISC_MEM_CHECKOVERRUN=0
---

diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index c0e1c5e264d..b2898c63658 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;
 	}