diff options
| author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2015-06-08 22:18:30 +0000 |
|---|---|---|
| committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2015-06-08 22:18:30 +0000 |
| commit | b218fd29ff2dbbad26eaecce1abe65ba3e791bdf (patch) | |
| tree | e90a8830da455044500206c7992bde6052232fc2 | |
| parent | d4168c4478bd1b1732fad06d7f3a188c5ddea4b7 (diff) | |
| download | libmicrohttpd-b218fd29ff2dbbad26eaecce1abe65ba3e791bdf.tar.gz libmicrohttpd-b218fd29ff2dbbad26eaecce1abe65ba3e791bdf.zip | |
fix: send_param_adapter(): do not send chunks larger than requested when using sendfile()
| -rw-r--r-- | src/microhttpd/daemon.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index 3952431c..b2fbbc43 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c | |||
| @@ -1107,15 +1107,15 @@ send_param_adapter (struct MHD_Connection *connection, | |||
| 1107 | /* can use sendfile */ | 1107 | /* can use sendfile */ |
| 1108 | offset = (off_t) connection->response_write_position + connection->response->fd_off; | 1108 | offset = (off_t) connection->response_write_position + connection->response->fd_off; |
| 1109 | left = connection->response->total_size - connection->response_write_position; | 1109 | left = connection->response->total_size - connection->response_write_position; |
| 1110 | if (left > SSIZE_MAX) | 1110 | if (i > left) |
| 1111 | left = SSIZE_MAX; /* cap at return value limit */ | 1111 | i = left; |
| 1112 | if (-1 != (ret = sendfile (connection->socket_fd, | 1112 | if (0 < (ret = sendfile (connection->socket_fd, |
| 1113 | fd, | 1113 | fd, |
| 1114 | &offset, | 1114 | &offset, |
| 1115 | (size_t) left))) | 1115 | i))) |
| 1116 | { | 1116 | { |
| 1117 | #if EPOLL_SUPPORT | 1117 | #if EPOLL_SUPPORT |
| 1118 | if (ret < left) | 1118 | if (requested_size > (size_t) ret) |
| 1119 | { | 1119 | { |
| 1120 | /* partial write --- no longer write-ready */ | 1120 | /* partial write --- no longer write-ready */ |
| 1121 | connection->epoll_state &= ~MHD_EPOLL_STATE_WRITE_READY; | 1121 | connection->epoll_state &= ~MHD_EPOLL_STATE_WRITE_READY; |