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/+/1028?usp=email
to review the following change.
Change subject: win: fix collecting DNS exclude domains
......................................................................
win: fix collecting DNS exclude domains
The size of the returned MULTI_SZ wide string was calculated wrongly.
Instead of adding the size of a WCHAR, only the size of a char was used.
As a result, the domains string was stored too short and was missing the
final string terminator.
Fixes: OpenVPN/openvpn#747
Change-Id: Ie3fcd845344fd0c3ce9a2f99612fb19fe5ebb2f1
Signed-off-by: Heiko Hund <he...@ist.eigentlich.net>
---
M src/openvpnserv/interactive.c
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/28/1028/1
diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c
index a1581a6..66afb7b 100644
--- a/src/openvpnserv/interactive.c
+++ b/src/openvpnserv/interactive.c
@@ -2226,7 +2226,7 @@
{
/* This was the last domain */
*pos = '\0';
- *size += 1;
+ *size += one_glyph;
return wcslen(domains) ? NO_ERROR :
ERROR_FILE_NOT_FOUND;
}
}
@@ -2248,13 +2248,13 @@
memmove(pos + 1, pos, buf_size - converted_size - one_glyph);
domains[buf_len - 1] = '\0';
*pos = '.';
- *size += 1;
+ *size += one_glyph;
if (!comma)
{
/* Conversion is done */
*(pos + domain_len) = '\0';
- *size += 1;
+ *size += one_glyph;
return NO_ERROR;
}
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1028?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: Ie3fcd845344fd0c3ce9a2f99612fb19fe5ebb2f1
Gerrit-Change-Number: 1028
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
