Attention is currently required from: flichtenheld.
Hello flichtenheld,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/915?usp=email
to review the following change.
Change subject: Directly use _countof in array initialisation
......................................................................
Directly use _countof in array initialisation
This fixes the build failures on MSVC cl compiler.
MSVC cl does not thinks of the expression of a const variable times
an integer to be compile time static. C23 introduce the constexpr
(like in C++) statement for that but we are only on C11 for now.
So directly use the _countof(msg->addr) expression in the array
initialisation.
Change-Id: Ib579c1538eb5440bb7008bc866a5cb7d74844374
Signed-off-by: Arne Schwabe <a...@rfc2549.org>
---
M src/openvpnserv/interactive.c
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/15/915/1
diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c
index e64ac30..abc2cda 100644
--- a/src/openvpnserv/interactive.c
+++ b/src/openvpnserv/interactive.c
@@ -34,6 +34,7 @@
#include <shellapi.h>
#include <mstcpip.h>
#include <inttypes.h>
+#include <assert.h>
#include <versionhelpers.h>
@@ -1901,7 +1902,9 @@
if (msg->addr_len > 0)
{
/* prepare the comma separated address list */
- CHAR addrs[max_addrs * 64]; /* 64 is enough for one IPv4/6 address */
+ /* cannot use max_addrs here as that is not considered compile
+ * time constant by all compilers and constexpr is C23 */
+ CHAR addrs[_countof(msg->addr) * 64]; /* 64 is enough for one IPv4/6
address */
size_t offset = 0;
for (int i = 0; i < addr_len; ++i)
{
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/915?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ib579c1538eb5440bb7008bc866a5cb7d74844374
Gerrit-Change-Number: 915
Gerrit-PatchSet: 1
Gerrit-Owner: plaisthos <arne-open...@rfc2549.org>
Gerrit-Reviewer: flichtenheld <fr...@lichtenheld.com>
Gerrit-CC: openvpn-devel <openvpn-devel@lists.sourceforge.net>
Gerrit-Attention: flichtenheld <fr...@lichtenheld.com>
Gerrit-MessageType: newchange
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
