summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--network_io/win32/sendrecv.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/network_io/win32/sendrecv.c b/network_io/win32/sendrecv.c
index e9c5a3952..b3e2a1c90 100644
--- a/network_io/win32/sendrecv.c
+++ b/network_io/win32/sendrecv.c
@@ -98,17 +98,12 @@ APR_DECLARE(apr_status_t) apr_socket_sendv(apr_socket_t *sock,
total_len = 0;
for (i = 0; i < in_vec; i++) {
apr_size_t iov_len = vec[i].iov_len;
- if (iov_len > MAXDWORD) {
- /* WSASend() returns NumberOfBytesSent as DWORD, so any iovec
- should be less than that. */
- return APR_EINVAL;
- }
- total_len += iov_len;
- if (total_len > MAXDWORD) {
+ if (iov_len > (apr_size_t)MAXDWORD - total_len) {
/* WSASend() returns NumberOfBytesSent as DWORD, so the total size
should be less than that. */
return APR_EINVAL;
}
+ total_len += iov_len;
}
pWsaBuf = (in_vec <= WSABUF_ON_STACK) ? _alloca(sizeof(WSABUF) * (in_vec))