diff options
author | Yann Ylavic <ylavic@apache.org> | 2022-10-18 07:20:23 +0000 |
---|---|---|
committer | Yann Ylavic <ylavic@apache.org> | 2022-10-18 07:20:23 +0000 |
commit | ea700ddd16405f7d37b7bf7bc68c748d5b0d35f9 (patch) | |
tree | 3ad570092bc19755cba184ab5248d4aa1c4d9763 | |
parent | 21c8cfb55bc0f865f13df38afb96a6056260cca8 (diff) | |
download | apr-ea700ddd16405f7d37b7bf7bc68c748d5b0d35f9.tar.gz |
apr_socket_sendv: WIN32: Limit the number of WSABUFs allocated for a single call.
* network_io/win32/sendrecv.c():
Define WSABUF_ON_HEAP to 500.
* network_io/win32/sendrecv.c(apr_socket_sendv):
Do not sendv more than WSABUF_ON_HEAP WSABUFs.
Merge r1902312 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1904674 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | network_io/win32/sendrecv.c | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/network_io/win32/sendrecv.c b/network_io/win32/sendrecv.c index 3fa0c8dda..5fbe41a9a 100644 --- a/network_io/win32/sendrecv.c +++ b/network_io/win32/sendrecv.c @@ -34,7 +34,10 @@ * than 8193 bytes. */ #define MAX_SEGMENT_SIZE 65536 + +/* Maximum number of WSABUF allocated for a single apr_socket_sendv() */ #define WSABUF_ON_STACK 50 +#define WSABUF_ON_HEAP 500 APR_DECLARE(apr_status_t) apr_socket_send(apr_socket_t *sock, const char *buf, apr_size_t *len) @@ -101,18 +104,26 @@ APR_DECLARE(apr_status_t) apr_socket_sendv(apr_socket_t *sock, apr_status_t rc = APR_SUCCESS; apr_ssize_t rv; apr_size_t cur_len; - apr_int32_t nvec = 0; - int i, j = 0; + apr_size_t nvec = 0; + apr_size_t n; + int i; DWORD dwBytes = 0; WSABUF *pWsaBuf; for (i = 0; i < in_vec; i++) { cur_len = vec[i].iov_len; - nvec++; + while (cur_len > APR_DWORD_MAX) { + if (nvec >= WSABUF_ON_HEAP) { + break; + } nvec++; cur_len -= APR_DWORD_MAX; } + if (nvec >= WSABUF_ON_HEAP) { + break; + } + nvec++; } pWsaBuf = (nvec <= WSABUF_ON_STACK) ? _alloca(sizeof(WSABUF) * (nvec)) @@ -120,25 +131,23 @@ APR_DECLARE(apr_status_t) apr_socket_sendv(apr_socket_t *sock, if (!pWsaBuf) return APR_ENOMEM; - for (i = 0; i < in_vec; i++) { + for (n = i = 0; n < nvec; i++) { char * base = vec[i].iov_base; cur_len = vec[i].iov_len; - + do { if (cur_len > APR_DWORD_MAX) { - pWsaBuf[j].buf = base; - pWsaBuf[j].len = APR_DWORD_MAX; + pWsaBuf[n].buf = base; + pWsaBuf[n].len = APR_DWORD_MAX; cur_len -= APR_DWORD_MAX; base += APR_DWORD_MAX; } else { - pWsaBuf[j].buf = base; - pWsaBuf[j].len = (DWORD)cur_len; + pWsaBuf[n].buf = base; + pWsaBuf[n].len = (DWORD)cur_len; cur_len = 0; } - j++; - - } while (cur_len > 0); + } while (++n < nvec && cur_len > 0); } #ifndef _WIN32_WCE rv = WSASend(sock->socketdes, pWsaBuf, nvec, &dwBytes, 0, NULL, NULL); |