cron2 has uploaded a new patch set (#7) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1496?usp=email )
The following approvals got outdated and were removed: Code-Review+2 by cron2 Change subject: openvpnserv: Improve sanity check for addr_len in HandleWINSConfigMessage ...................................................................... openvpnserv: Improve sanity check for addr_len in HandleWINSConfigMessage Handle the case where the int is negative explicitly. Zero is probably a safer value to assume in this case. Change-Id: I03f4c640a2adbea9bbb6f6334f12375041ec429c Signed-off-by: Frank Lichtenheld <[email protected]> Acked-by: Gert Doering <[email protected]> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1496 Message-Id: <[email protected]> URL: https://www.mail-archive.com/[email protected]/msg35923.html Signed-off-by: Gert Doering <[email protected]> --- M src/openvpnserv/interactive.c 1 file changed, 5 insertions(+), 10 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/96/1496/7 diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c index 227431a..09c709e 100644 --- a/src/openvpnserv/interactive.c +++ b/src/openvpnserv/interactive.c @@ -1247,11 +1247,6 @@ return err; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif - /** * Check for a valid search list in a certain key of the registry * @@ -2944,7 +2939,11 @@ int addr_len = msg->addr_len; /* sanity check */ - if (addr_len > _countof(msg->addr)) + if (addr_len < 0) + { + addr_len = 0; + } + if ((unsigned int)addr_len > _countof(msg->addr)) { addr_len = _countof(msg->addr); } @@ -3005,10 +3004,6 @@ return err; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - static DWORD HandleEnableDHCPMessage(const enable_dhcp_message_t *dhcp) { -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1496?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I03f4c640a2adbea9bbb6f6334f12375041ec429c Gerrit-Change-Number: 1496 Gerrit-PatchSet: 7 Gerrit-Owner: flichtenheld <[email protected]> Gerrit-Reviewer: cron2 <[email protected]> Gerrit-Reviewer: plaisthos <[email protected]> Gerrit-CC: openvpn-devel <[email protected]>
_______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
