From: Frank Lichtenheld <[email protected]> The assignment implicitly converts the values, but we can just do the comparison before the assignment.
Change-Id: Idf5ce8f82e7727505cce67560e0b7423b8e41a40 Signed-off-by: Frank Lichtenheld <[email protected]> Acked-by: Gert Doering <[email protected]> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1523 --- 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/+/1523 This mail reflects revision 3 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering <[email protected]> diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c index 8d2d110..5df0792 100644 --- a/src/openvpn/socket.c +++ b/src/openvpn/socket.c @@ -2550,11 +2550,6 @@ return WSAGetLastError(); } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif - int socket_recv_queue(struct link_socket *sock, int maxsize) { @@ -2579,11 +2574,10 @@ /* Win32 docs say it's okay to allocate the wsabuf on the stack */ wsabuf[0].buf = BSTR(&sock->reads.buf); + /* make sure maxsize is sane */ + ASSERT(maxsize <= BLEN(&sock->reads.buf)); wsabuf[0].len = maxsize ? maxsize : BLEN(&sock->reads.buf); - /* check for buffer overflow */ - ASSERT(wsabuf[0].len <= BLEN(&sock->reads.buf)); - /* the overlapped read will signal this event on I/O completion */ ASSERT(ResetEvent(sock->reads.overlapped.hEvent)); sock->reads.flags = 0; @@ -2656,10 +2650,6 @@ return sock->reads.iostate; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - int socket_send_queue(struct link_socket *sock, struct buffer *buf, const struct link_socket_actual *to) { _______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
