From: Heiko Hund Date: Sat, 22 Nov 2025 15:55:00 +0000 (+0100) Subject: iservice: fix buffer size in call to FormatMessage X-Git-Tag: v2.7_rc3~23 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b39bed539f218f6165d79224adbc343a63a4514d;p=thirdparty%2Fopenvpn.git iservice: fix buffer size in call to FormatMessage The buffer size is to be given in # of TCHARs according to the docs. In this case that is the number of WCHARs in the buffer. While here, remove the unused FORMAT_MESSAGE_ARGUMENT_ARRAY flag. Just to make things a bit shorter. Reported-by: stephan@srlabs.de Change-Id: I4c3e5aed23d2e4c543066bb8032ad8808dcd27a8 Signed-off-by: Heiko Hund Acked-by: Gert Doering Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1387 Message-Id: <20251122155506.8901-1-gert@greenie.muc.de> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg34583.html Signed-off-by: Gert Doering --- diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c index 33282c635..f64c24725 100644 --- a/src/openvpnserv/interactive.c +++ b/src/openvpnserv/interactive.c @@ -734,9 +734,8 @@ BlockDNSErrHandler(DWORD err, const char *msg) err_str = L"Unknown Win32 Error"; - if (FormatMessage(FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM - | FORMAT_MESSAGE_ARGUMENT_ARRAY, - NULL, err, 0, buf, sizeof(buf), NULL)) + if (FormatMessageW(FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, err, 0, buf, _countof(buf), NULL)) { err_str = buf; }