From: Howard Chu <hyc@openldap.org>
Date: Mon, 15 Feb 2016 00:07:04 +0000 (+0000)
Subject: Tweak Win32 errmsg buffer
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d909ab2f36e079087047dd842210b37cec8b6a84;p=openldap

Tweak Win32 errmsg buffer
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index cddc746043..f5980807f6 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -1572,8 +1572,9 @@ mdb_strerror(int err)
 	 *	This works as long as no function between the call to mdb_strerror
 	 *	and the actual use of the message uses more than 4K of stack.
 	 */
-	char pad[4096];
-	char buf[1024], *ptr = buf;
+#define MSGSIZE	1024
+#define PADSIZE 4096
+	char buf[MSGSIZE+PADSIZE], *ptr = buf;
 #endif
 	int i;
 	if (!err)
@@ -1605,7 +1606,7 @@ mdb_strerror(int err)
 	buf[0] = 0;
 	FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM |
 		FORMAT_MESSAGE_IGNORE_INSERTS,
-		NULL, err, 0, ptr, sizeof(buf), (va_list *)pad);
+		NULL, err, 0, ptr, MSGSIZE, (va_list *)buf+MSGSIZE);
 	return ptr;
 #else
 	return strerror(err);