Attention is currently required from: flichtenheld, plaisthos.
Hello plaisthos, flichtenheld,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/908?usp=email
to review the following change.
Change subject: win: calculate address string buffer size
......................................................................
win: calculate address string buffer size
Instead of making the string buffer statically sized for a max. of
four addresses, calculate it to hold up to the max number of addresses
a dns_cfg_message_t can hold (currently four as well). Improves the code
so that it doesn't rely on the addresses never being more than four in
the future.
Change-Id: I23710b1f5b2122ec1f14465911836c0f0afa9c64
Signed-off-by: Heiko Hund <he...@ist.eigentlich.net>
---
M src/openvpnserv/interactive.c
1 file changed, 4 insertions(+), 3 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/08/908/1
diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c
index eb3c867..90af02d 100644
--- a/src/openvpnserv/interactive.c
+++ b/src/openvpnserv/interactive.c
@@ -1866,9 +1866,10 @@
int addr_len = msg->addr_len;
/* sanity check */
- if (addr_len > _countof(msg->addr))
+ const size_t max_addrs = _countof(msg->addr);
+ if (addr_len > max_addrs)
{
- addr_len = _countof(msg->addr);
+ addr_len = max_addrs;
}
if (!msg->iface.name[0]) /* interface name is required */
@@ -1918,7 +1919,7 @@
if (msg->addr_len > 0)
{
/* prepare the comma separated address list */
- CHAR addrs[256]; /* large enough to hold four IPv4 / IPv6 address
strings */
+ CHAR addrs[max_addrs * 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/+/908?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: I23710b1f5b2122ec1f14465911836c0f0afa9c64
Gerrit-Change-Number: 908
Gerrit-PatchSet: 1
Gerrit-Owner: d12fk <he...@openvpn.net>
Gerrit-Reviewer: flichtenheld <fr...@lichtenheld.com>
Gerrit-Reviewer: plaisthos <arne-open...@rfc2549.org>
Gerrit-CC: openvpn-devel <openvpn-devel@lists.sourceforge.net>
Gerrit-Attention: plaisthos <arne-open...@rfc2549.org>
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
