From: Frank Lichtenheld <[email protected]> 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 --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1496 This mail reflects revision 5 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering <[email protected]> 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) { _______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
